Reverted commit 143546 related to PR c++/26693

From-SVN: r143562

1 files changed, 19 insertions, 11 deletions

diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 2c69cfe68a6..f8d0204f099 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -847,20 +847,28 @@ pushdecl_maybe_friend (tree x, bool is_friend)
 
       /* If declaring a type as a typedef, copy the type (unless we're
 	 at line 0), and install this TYPE_DECL as the new type's typedef
-	 name.  See the extensive comment of set_underlying_type ().  */
+	 name.  See the extensive comment in ../c-decl.c (pushdecl).  */
       if (TREE_CODE (x) == TYPE_DECL)
 	{
 	  tree type = TREE_TYPE (x);
-
-	  if (DECL_IS_BUILTIN (x)
-	      || (TREE_TYPE (x) != error_mark_node
-		  && TYPE_NAME (type) != x
-		  /* We don't want to copy the type when all we're
-		     doing is making a TYPE_DECL for the purposes of
-		     inlining.  */
-		  && (!TYPE_NAME (type)
-		      || TYPE_NAME (type) != DECL_ABSTRACT_ORIGIN (x))))
-	    set_underlying_type (x);
+	  if (DECL_IS_BUILTIN (x))
+	    {
+	      if (TYPE_NAME (type) == 0)
+		TYPE_NAME (type) = x;
+	    }
+	  else if (type != error_mark_node && TYPE_NAME (type) != x
+		   /* We don't want to copy the type when all we're
+		      doing is making a TYPE_DECL for the purposes of
+		      inlining.  */
+		   && (!TYPE_NAME (type)
+		       || TYPE_NAME (type) != DECL_ABSTRACT_ORIGIN (x)))
+	    {
+	      DECL_ORIGINAL_TYPE (x) = type;
+	      type = build_variant_type_copy (type);
+	      TYPE_STUB_DECL (type) = TYPE_STUB_DECL (DECL_ORIGINAL_TYPE (x));
+	      TYPE_NAME (type) = x;
+	      TREE_TYPE (x) = type;
+	    }
 
 	  if (type != error_mark_node
 	      && TYPE_NAME (type)