[llvm-commits] [llvm-gcc-4.2] r40001 - /llvm-gcc-4.2/trunk/gcc/cp/pt.c

[Duncan Sands]

Author: baldrick
Date: Wed Jul 18 08:25:34 2007
New Revision: 40001

URL: http://llvm.org/viewvc/llvm-project?rev=40001&view=rev
Log:
Restore dropped SET_DECL_ASSEMBLER_NAME and add a missing
SET_DECL_LLVM.  Yes, gcc really does call SET_DECL_RTL
twice in a row, identically, here, even in current gcc svn.

Modified:
    llvm-gcc-4.2/trunk/gcc/cp/pt.c

Modified: llvm-gcc-4.2/trunk/gcc/cp/pt.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/pt.c?rev=40001&r1=40000&r2=40001&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cp/pt.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cp/pt.c Wed Jul 18 08:25:34 2007
@@ -7002,26 +7002,26 @@
 	cp_apply_type_quals_to_decl (cp_type_quals (type), r);
 	DECL_CONTEXT (r) = ctx;
 	/* Clear out the mangled name and RTL for the instantiation.  */
-        /* LLVM LOCAL begin */
-#ifndef ENABLE_LLVM
-        SET_DECL_RTL (r, NULL_RTX);
-#else
-        SET_DECL_LLVM (r, 0);
-#endif
-        /* LLVM LOCAL end */
+        SET_DECL_ASSEMBLER_NAME (r, NULL_TREE);
 	if (CODE_CONTAINS_STRUCT (TREE_CODE (t), TS_DECL_WRTL))
         /* LLVM LOCAL begin */
 #ifndef ENABLE_LLVM
-        SET_DECL_RTL (r, NULL_RTX);
+	  SET_DECL_RTL (r, NULL_RTX);
 #else
-        SET_DECL_LLVM (r, 0);
+	  SET_DECL_LLVM (r, 0);
 #endif
         /* LLVM LOCAL end */
 	/* The initializer must not be expanded until it is required;
 	   see [temp.inst].  */
 	DECL_INITIAL (r) = NULL_TREE;
 	if (CODE_CONTAINS_STRUCT (TREE_CODE (t), TS_DECL_WRTL))
+        /* LLVM LOCAL begin */
+#ifndef ENABLE_LLVM
 	  SET_DECL_RTL (r, NULL_RTX);
+#else
+	  SET_DECL_LLVM (r, 0);
+#endif
+        /* LLVM LOCAL end */
 	DECL_SIZE (r) = DECL_SIZE_UNIT (r) = 0;
 	if (TREE_CODE (r) == VAR_DECL)
 	  {