From: Jan Hubicka <jh@suse.cz>
Date: Tue, 2 Jul 2019 08:23:02 +0000 (+0200)
Subject: lto-common.c (lto_register_canonical_types_for_odr_types): Copy CXX_ODR_P from the... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=606a9a8c728f2dae6b9d58397fcefb3cb0fa0db8;p=gcc.git

lto-common.c (lto_register_canonical_types_for_odr_types): Copy CXX_ODR_P from the main variant.

	* lto-common.c (lto_register_canonical_types_for_odr_types):
	Copy CXX_ODR_P from the main variant.

From-SVN: r272923
---

diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index e853f5c9827..ae4e1572496 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,8 @@
+2019-06-27  Jan Hubicka  <jh@suse.cz>
+
+	* lto-common.c (lto_register_canonical_types_for_odr_types):
+	Copy CXX_ODR_P from the main variant.
+
 2019-06-27  Jan Hubicka  <jh@suse.cz>
 
 	* lto-common.c: tree-pretty-print.h
diff --git a/gcc/lto/lto-common.c b/gcc/lto/lto-common.c
index 1275b673506..2b3165a77f4 100644
--- a/gcc/lto/lto-common.c
+++ b/gcc/lto/lto-common.c
@@ -568,8 +568,17 @@ lto_register_canonical_types_for_odr_types ()
 
   /* Register all remaining types.  */
   FOR_EACH_VEC_ELT (*types_to_register, i, t)
-    if (!TYPE_CANONICAL (t))
-      gimple_register_canonical_type (t);
+    {
+      /* For pre-streamed types like va-arg it is possible that main variant
+	 is !CXX_ODR_P while the variant (which is streamed) is.
+	 Copy CXX_ODR_P to make type verifier happy.  This is safe because
+	 in canonical type calculation we only consider main variants.
+	 However we can not change this flag before streaming is finished
+	 to not affect tree merging.  */
+      TYPE_CXX_ODR_P (t) = TYPE_CXX_ODR_P (TYPE_MAIN_VARIANT (t));
+      if (!TYPE_CANONICAL (t))
+        gimple_register_canonical_type (t);
+    }
 }