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

[Tanya Brethour]

Changes in directory llvm-gcc/gcc:

llvm-expand.c updated: 1.72 -> 1.73
llvm-out.c updated: 1.9 -> 1.10
---
Log message:


Revert these patches.  The breakage was not due to these changes, and this
breaks the build of the CFE.


---
Diffs of the changes:  (+5 -5)

Index: llvm-gcc/gcc/llvm-expand.c
diff -u llvm-gcc/gcc/llvm-expand.c:1.72 llvm-gcc/gcc/llvm-expand.c:1.73
--- llvm-gcc/gcc/llvm-expand.c:1.72	Wed Dec  1 00:02:30 2004
+++ llvm-gcc/gcc/llvm-expand.c	Wed Dec  1 01:09:25 2004
@@ -2668,7 +2668,7 @@
     int saved_stmts_are_full_exprs_p = stmts_are_full_exprs_p ();
     prep_stmt (t);
   
-    if(0 && debug_info_level > DINFO_LEVEL_NONE){
+    if(debug_info_level > DINFO_LEVEL_NONE){
       if(TREE_CODE(t) == COMPOUND_STMT){
 	/* skip compound statements - we handle their components. 
 	   Avoids emitting multiple stop points for a single line. */
@@ -6918,7 +6918,7 @@
   /*assert(!current_function_needs_context && "Case not handled!");*/
   TREE_ASM_WRITTEN(subr) = 1;
 
-  if (0&& debug_info_level > DINFO_LEVEL_NONE) {
+  if (debug_info_level > DINFO_LEVEL_NONE) {
    /* emit global with info and prepare call to function start intrinsic. */
     llvm_emit_dbg_function_info(Fn);
   }
@@ -7016,7 +7016,7 @@
   assert(Fn->ExpandInfo->GotoFixupList == 0 && "Goto fixups remain?");
   assert(Fn->ExpandInfo->InnermostScope == 0 && "A scope didn't get popped?");
 
-  if(0 && debug_info_level > DINFO_LEVEL_NONE){
+  if(debug_info_level > DINFO_LEVEL_NONE){
     /* emit region end intrinsic to end the function */
     llvm_emit_region_end(Fn);
   }
@@ -7674,7 +7674,7 @@
   llvm_basicblock *CurBB = 0;
 
   /* If we're not emitting debug info, just bypass this. */
-  if (0 && debug_info_level <= DINFO_LEVEL_NONE)
+  if (debug_info_level <= DINFO_LEVEL_NONE)
     return;
 
   CurBB = llvm_ilist_back(llvm_basicblock, Fn->BasicBlocks);


Index: llvm-gcc/gcc/llvm-out.c
diff -u llvm-gcc/gcc/llvm-out.c:1.9 llvm-gcc/gcc/llvm-out.c:1.10
--- llvm-gcc/gcc/llvm-out.c:1.9	Wed Dec  1 00:02:30 2004
+++ llvm-gcc/gcc/llvm-out.c	Wed Dec  1 01:09:25 2004
@@ -61,7 +61,7 @@
   llvm_InitializeTypeSystem();
   llvm_InitializeConstants();
 
-  if (0 && debug_info_level > DINFO_LEVEL_NONE)
+  if (debug_info_level > DINFO_LEVEL_NONE)
     InitDebuggerTypeDecls();
 }