Merge in trunk.

[thirdparty/gcc.git] / gcc / tree-core.h

diff --git a/gcc/tree-core.h b/gcc/tree-core.h
index 57af2377fb7978eb00efb5be47a11b6099da611e..85d160c20771cadb597af6d1acb3cd2229321d5b 100644 (file)
--- a/gcc/tree-core.h
+++ b/gcc/tree-core.h
@@ -1007,6 +1007,9 @@ struct GTY(()) tree_base {
        SSA_NAME_IN_FREELIST in
           SSA_NAME
 
+       VAR_DECL_NONALIASED in
+         VAR_DECL
+
    deprecated_flag:
 
        TREE_DEPRECATED in
@@ -1285,11 +1288,11 @@ struct GTY(()) tree_type_common {
     const char * GTY ((tag ("TYPE_SYMTAB_IS_POINTER"))) pointer;
     struct die_struct * GTY ((tag ("TYPE_SYMTAB_IS_DIE"))) die;
   } GTY ((desc ("debug_hooks->tree_type_symtab_field"))) symtab;
-  tree name;
+  tree canonical;
   tree next_variant;
   tree main_variant;
   tree context;
-  tree canonical;
+  tree name;
 };
 
 struct GTY(()) tree_type_with_lang_specific {