2015-12-17 Christian Bruel <christian.bruel@st.com>

	* tree.h (TYPE_MODE_RAW): New macro.
	* tree-streamer-out.c (pack_ts_type_common_value_fields):
	Replace TYPE_MODE by TYPE_MODE_RAW.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231758 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f836652c9afb2b1c7457d3a67ec4f6893cb10913..1db66d6583bb23a5156444bad7aae9cc1a2561de 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-17  Christian Bruel  <christian.bruel@st.com>
+
+       * tree.h (TYPE_MODE_RAW): New macro.
+       * tree-streamer-out.c (pack_ts_type_common_value_fields):
+       Replace TYPE_MODE by TYPE_MODE_RAW.
+
 2015-12-17  Jakub Jelinek  <jakub@redhat.com>
 
        PR tree-optimization/68835

diff --git a/gcc/tree-streamer-out.c b/gcc/tree-streamer-out.c
index bfd06449ecbc9bbe2cfe2e28fc44c8c783f1fbbe..ddb7eee6adebe2274d22a9550ee0f5799cdf8886 100644 (file)
--- a/gcc/tree-streamer-out.c
+++ b/gcc/tree-streamer-out.c
@@ -308,7 +308,10 @@ pack_ts_function_decl_value_fields (struct bitpack_d *bp, tree expr)
 static void
 pack_ts_type_common_value_fields (struct bitpack_d *bp, tree expr)
 {
-  bp_pack_machine_mode (bp, TYPE_MODE (expr));
+  /* for VECTOR_TYPE, TYPE_MODE reevaluates the mode using target_flags
+     not necessary valid in a global context.
+     Use the raw value previously set by layout_type.  */
+  bp_pack_machine_mode (bp, TYPE_MODE_RAW (expr));
   bp_pack_value (bp, TYPE_STRING_FLAG (expr), 1);
   /* TYPE_NO_FORCE_BLK is private to stor-layout and need
      no streaming.  */

diff --git a/gcc/tree.h b/gcc/tree.h
index 96ffa83cdf94bbe3ca0031098001562646151169..5d1a77c76fc10a50c7fc8619f098d19226b0d9da 100644 (file)
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -1793,6 +1793,7 @@ extern void protected_set_expr_location (tree, location_t);
 #define TYPE_MAIN_VARIANT(NODE) (TYPE_CHECK (NODE)->type_common.main_variant)
 #define TYPE_CONTEXT(NODE) (TYPE_CHECK (NODE)->type_common.context)
 
+#define TYPE_MODE_RAW(NODE) (TYPE_CHECK (NODE)->type_common.mode)
 #define TYPE_MODE(NODE) \
   (VECTOR_TYPE_P (TYPE_CHECK (NODE)) \
    ? vector_type_mode (NODE) : (NODE)->type_common.mode)