* go-gcc.cc (set_placeholder_pointer_type): Arrange for the type

	name to have a DECL_ORIGINAL_TYPE as gcc expects.
	(set_placeholder_struct_type): Likewise.
	(set_placeholder_array_type): Likewise.
	(named_type): Set DECL_ORIGINAL_TYPE.

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

diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index 9b17bf4..fcd137b 100644 (file)
--- a/gcc/go/ChangeLog
+++ b/gcc/go/ChangeLog
@@ -1,3 +1,11 @@
+2011-12-22  Ian Lance Taylor  <iant@google.com>
+
+       * go-gcc.cc (set_placeholder_pointer_type): Arrange for the type
+       name to have a DECL_ORIGINAL_TYPE as gcc expects.
+       (set_placeholder_struct_type): Likewise.
+       (set_placeholder_array_type): Likewise.
+       (named_type): Set DECL_ORIGINAL_TYPE.
+
 2011-12-13  Ian Lance Taylor  <iant@google.com>
 
        * go-backend.c: #include "simple-object.h" and "intl.h".

diff --git a/gcc/go/go-gcc.cc b/gcc/go/go-gcc.cc
index f5214db..b4ec275 100644 (file)
--- a/gcc/go/go-gcc.cc
+++ b/gcc/go/go-gcc.cc
@@ -619,6 +619,13 @@ Gcc_backend::set_placeholder_pointer_type(Btype* placeholder,
     }
   gcc_assert(TREE_CODE(tt) == POINTER_TYPE);
   TREE_TYPE(pt) = TREE_TYPE(tt);
+  if (TYPE_NAME(pt) != NULL_TREE)
+    {
+      // Build the data structure gcc wants to see for a typedef.
+      tree copy = build_variant_type_copy(pt);
+      TYPE_NAME(copy) = NULL_TREE;
+      DECL_ORIGINAL_TYPE(TYPE_NAME(pt)) = copy;
+    }
   return true;
 }
 
@@ -654,6 +661,12 @@ Gcc_backend::set_placeholder_struct_type(
   tree t = placeholder->get_tree();
   gcc_assert(TREE_CODE(t) == RECORD_TYPE && TYPE_FIELDS(t) == NULL_TREE);
   Btype* r = this->fill_in_struct(placeholder, fields);
+
+  // Build the data structure gcc wants to see for a typedef.
+  tree copy = build_variant_type_copy(t);
+  TYPE_NAME(copy) = NULL_TREE;
+  DECL_ORIGINAL_TYPE(TYPE_NAME(t)) = copy;
+
   return r->get_tree() != error_mark_node;
 }
 
@@ -681,6 +694,12 @@ Gcc_backend::set_placeholder_array_type(Btype* placeholder,
   tree t = placeholder->get_tree();
   gcc_assert(TREE_CODE(t) == ARRAY_TYPE && TREE_TYPE(t) == NULL_TREE);
   Btype* r = this->fill_in_array(placeholder, element_btype, length);
+
+  // Build the data structure gcc wants to see for a typedef.
+  tree copy = build_variant_type_copy(t);
+  TYPE_NAME(copy) = NULL_TREE;
+  DECL_ORIGINAL_TYPE(TYPE_NAME(t)) = copy;
+
   return r->get_tree() != error_mark_node;
 }
 
@@ -693,12 +712,13 @@ Gcc_backend::named_type(const std::string& name, Btype* btype,
   tree type = btype->get_tree();
   if (type == error_mark_node)
     return this->error_type();
-  type = build_variant_type_copy(type);
+  tree copy = build_variant_type_copy(type);
   tree decl = build_decl(location.gcc_location(), TYPE_DECL,
                         get_identifier_from_string(name),
-                        type);
-  TYPE_NAME(type) = decl;
-  return this->make_type(type);
+                        copy);
+  DECL_ORIGINAL_TYPE(decl) = type;
+  TYPE_NAME(copy) = decl;
+  return this->make_type(copy);
 }
 
 // Return a pointer type used as a marker for a circular type.