[llvm-commits] CVS: llvm/lib/Transforms/Utils/Local.cpp

[Chris Lattner]

Changes in directory llvm/lib/Transforms/Utils:

Local.cpp updated: 1.6 -> 1.7

---
Log message:

The fixme is irrelevant: if that happens, the LLVM bytecode is malformed.
This fixes testcase: SimplifyCFG/2003-08-17-BranchFold.ll


---
Diffs of the changes:

Index: llvm/lib/Transforms/Utils/Local.cpp
diff -u llvm/lib/Transforms/Utils/Local.cpp:1.6 llvm/lib/Transforms/Utils/Local.cpp:1.7
--- llvm/lib/Transforms/Utils/Local.cpp:1.6	Tue May 20 16:01:18 2003
+++ llvm/lib/Transforms/Utils/Local.cpp	Sun Aug 17 14:34:55 2003
@@ -61,12 +61,7 @@
       // unconditional branch.
       BI->setUnconditionalDest(Destination);
       return true;
-    }
-#if 0
-    // FIXME: TODO: This doesn't work if the destination has PHI nodes with
-    // different incoming values on each branch!
-    //
-    else if (Dest2 == Dest1) {       // Conditional branch to same location?
+    } else if (Dest2 == Dest1) {       // Conditional branch to same location?
       // This branch matches something like this:  
       //     br bool %cond, label %Dest, label %Dest
       // and changes it into:  br label %Dest
@@ -79,7 +74,6 @@
       BI->setUnconditionalDest(Dest1);
       return true;
     }
-#endif
   }
   return false;
 }