[llvm-commits] [llvm-gcc-4.2] r64659 - /llvm-gcc-4.2/branches/Apple/Dib/gcc/cp/name-lookup.c

[Bill Wendling]

Author: void
Date: Mon Feb 16 13:38:38 2009
New Revision: 64659

URL: http://llvm.org/viewvc/llvm-project?rev=64659&view=rev
Log:
--- Merging (from foreign repository) r64648 into '.':
U    gcc/cp/name-lookup.c

A patch was added in gcc-4.2 to copy TYPE_DECL as the new type's typedef name if
the type is anonymous.  This patch is not required in llvm-gcc.  The difference
is due to the way gcc and llvm-gcc walks gcc trees to emit debug info.

Modified:
    llvm-gcc-4.2/branches/Apple/Dib/gcc/cp/name-lookup.c

Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/cp/name-lookup.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/cp/name-lookup.c?rev=64659&r1=64658&r2=64659&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/cp/name-lookup.c (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/cp/name-lookup.c Mon Feb 16 13:38:38 2009
@@ -817,7 +817,12 @@
 	  /* Make sure to do the copying if the type was anonymous  */
 	  else if (type != error_mark_node 
 		   && ((TYPE_NAME (type) != x) 
+#ifdef ENABLE_LLVM
+                       /* llvm-gcc does not need a copy if the type was anonymous.  */
+                       )
+#else
 		       || (TYPE_LANG_SPECIFIC (type) && TYPE_WAS_ANONYMOUS (type)))
+#endif
 	  /* APPLE LOCAL end radar 6007135, typedef of anonymous struct  */
 		   /* We don't want to copy the type when all we're
 		      doing is making a TYPE_DECL for the purposes of