[llvm-commits] [llvm-gcc-4.2] r40002 - in /llvm-gcc-4.2/trunk/gcc: ada/utils.c c-parser.c cp/init.c cp/semantics.c java/decl.c

[Duncan Sands]

Author: baldrick
Date: Wed Jul 18 10:03:41 2007
New Revision: 40002

URL: http://llvm.org/viewvc/llvm-project?rev=40002&view=rev
Log:
Add a bunch of reasonable looking decl_rtl -> decl_llvm
changes.

Modified:
    llvm-gcc-4.2/trunk/gcc/ada/utils.c
    llvm-gcc-4.2/trunk/gcc/c-parser.c
    llvm-gcc-4.2/trunk/gcc/cp/init.c
    llvm-gcc-4.2/trunk/gcc/cp/semantics.c
    llvm-gcc-4.2/trunk/gcc/java/decl.c

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

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/ada/utils.c (original)
+++ llvm-gcc-4.2/trunk/gcc/ada/utils.c Wed Jul 18 10:03:41 2007
@@ -1736,7 +1736,13 @@
        param_decl = TREE_CHAIN (param_decl))
     DECL_CONTEXT (param_decl) = subprog_decl;
 
+/* LLVM LOCAL begin */
+#ifndef ENABLE_LLVM
   make_decl_rtl (subprog_decl);
+#else
+  make_decl_llvm (subprog_decl);
+#endif
+/* LLVM LOCAL end */
 
   /* We handle pending sizes via the elaboration of types, so we don't need to
      save them.  This causes them to be marked as part of the outer function

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

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-parser.c (original)
+++ llvm-gcc-4.2/trunk/gcc/c-parser.c Wed Jul 18 10:03:41 2007
@@ -8589,8 +8589,15 @@
 	      /* If rtl has been already set for this var, call
 		 make_decl_rtl once again, so that encode_section_info
 		 has a chance to look at the new decl flags.  */
+/* LLVM LOCAL begin */
+#ifndef ENABLE_LLVM
 	      if (DECL_RTL_SET_P (v))
 		make_decl_rtl (v);
+#else
+	      if (DECL_LLVM_SET_P (v))
+		make_decl_llvm (v);
+#endif
+/* LLVM LOCAL end */
 	    }
 	  C_DECL_THREADPRIVATE_P (v) = 1;
 	}

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

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cp/init.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cp/init.c Wed Jul 18 10:03:41 2007
@@ -2198,7 +2198,13 @@
       DECL_ARTIFICIAL (class_decl) = 1;
       DECL_IGNORED_P (class_decl) = 1;
       pushdecl_top_level (class_decl);
+/* LLVM LOCAL begin */
+#ifndef ENABLE_LLVM
       make_decl_rtl (class_decl);
+#else
+      make_decl_llvm (class_decl);
+#endif
+/* LLVM LOCAL end */
     }
   return class_decl;
 }

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

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cp/semantics.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cp/semantics.c Wed Jul 18 10:03:41 2007
@@ -3734,8 +3734,15 @@
 	      /* If rtl has been already set for this var, call
 		 make_decl_rtl once again, so that encode_section_info
 		 has a chance to look at the new decl flags.  */
+/* LLVM LOCAL begin */
+#ifndef ENABLE_LLVM
 	      if (DECL_RTL_SET_P (v))
 		make_decl_rtl (v);
+#else
+	      if (DECL_LLVM_SET_P (v))
+		make_decl_llvm (v);
+#endif
+/* LLVM LOCAL end */
 	    }
 	  CP_DECL_THREADPRIVATE_P (v) = 1;
 	}

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

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/java/decl.c (original)
+++ llvm-gcc-4.2/trunk/gcc/java/decl.c Wed Jul 18 10:03:41 2007
@@ -2097,8 +2097,15 @@
      moment we force flag_unit_at_a_time off due to excessive memory
      consumption when compiling large jar files.  Which probably means
      that we need to re-order how we process jar files...  */
+/* LLVM LOCAL begin */
+#ifndef ENABLE_LLVM
   if (DECL_RTL_SET_P (decl))
     make_decl_rtl (decl);
+#else
+  if (DECL_LLVM_SET_P (decl))
+    make_decl_llvm (decl);
+#endif
+/* LLVM LOCAL end */
 }
 
 /* Given appropriate target support, G++ will emit hidden aliases for native