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

	* 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 e853f5c..ae4e157 100644 (file)
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,5 +1,10 @@
 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
        (type_streaming_finished): New static var.
        (gimple_register_canonical_type_1): Return updated hash; handle ODR

diff --git a/gcc/lto/lto-common.c b/gcc/lto/lto-common.c
index 1275b67..2b3165a 100644 (file)
--- 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);
+    }
 }