[llvm-commits] CVS: llvm-gcc/gcc/llvm-expand.c llvm-representation.c

[Chris Lattner]

Changes in directory llvm-gcc/gcc:

llvm-expand.c updated: 1.68 -> 1.69
llvm-representation.c updated: 1.13 -> 1.14
---
Log message:

Revert patch for PR459: http://llvm.cs.uiuc.edu/PR459 , which breaks libstdc++.


---
Diffs of the changes:  (+8 -0)

Index: llvm-gcc/gcc/llvm-expand.c
diff -u llvm-gcc/gcc/llvm-expand.c:1.68 llvm-gcc/gcc/llvm-expand.c:1.69
--- llvm-gcc/gcc/llvm-expand.c:1.68	Sat Nov 27 18:40:58 2004
+++ llvm-gcc/gcc/llvm-expand.c	Sun Nov 28 00:34:18 2004
@@ -7106,6 +7106,12 @@
 
   if (!DECL_LLVM_SET_P(decl))
     llvm_make_decl_llvm(decl, asmspec);
+
+  if (DECL_LLVM_SET_P(decl)) {            /* Ignore builtin functions */
+    /* This horrible code mirrors code found in varasm.c:assemble_name */
+    if (!llvm_value_is_global(DECL_LLVM(decl))) abort();
+    MarkNameAsUsed(DECL_LLVM(decl)->Name);
+  }
 }
 
 


Index: llvm-gcc/gcc/llvm-representation.c
diff -u llvm-gcc/gcc/llvm-representation.c:1.13 llvm-gcc/gcc/llvm-representation.c:1.14
--- llvm-gcc/gcc/llvm-representation.c:1.13	Sat Nov 27 17:00:36 2004
+++ llvm-gcc/gcc/llvm-representation.c	Sun Nov 28 00:34:18 2004
@@ -263,6 +263,7 @@
    * global, and the MarkNameAsUsed code isn't particularly fast, so keep track
    * of whether we've done this already or not.
    */
+#if 0
   if (V->VTy == Function && !V2F(V)->MarkedNameUsed) {
     V2F(V)->MarkedNameUsed = 1;
     MarkNameAsUsed(V->Name);
@@ -270,6 +271,7 @@
     V2GV(V)->MarkedNameUsed = 1;
     MarkNameAsUsed(V->Name);
   }
+#endif
 }
 
 /* llvm_constant implementation ********************************************