[llvm-commits] [llvm] r65308 - in /llvm/branches/Apple/Dib: include/llvm/CodeGen/DebugLoc.h lib/Transforms/Utils/SimplifyCFG.cpp

[Bill Wendling]

Author: void
Date: Mon Feb 23 00:58:20 2009
New Revision: 65308

URL: http://llvm.org/viewvc/llvm-project?rev=65308&view=rev
Log:
Revert patches applied by mistake.

Modified:
    llvm/branches/Apple/Dib/include/llvm/CodeGen/DebugLoc.h
    llvm/branches/Apple/Dib/lib/Transforms/Utils/SimplifyCFG.cpp

Modified: llvm/branches/Apple/Dib/include/llvm/CodeGen/DebugLoc.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/include/llvm/CodeGen/DebugLoc.h?rev=65308&r1=65307&r2=65308&view=diff

==============================================================================
--- llvm/branches/Apple/Dib/include/llvm/CodeGen/DebugLoc.h (original)
+++ llvm/branches/Apple/Dib/include/llvm/CodeGen/DebugLoc.h Mon Feb 23 00:58:20 2009
@@ -22,25 +22,11 @@
 
   /// DebugLocTuple - Debug location tuple of filename id, line and column.
   ///
-  class DebugLocTuple {
-    enum { Mask = 0xFFFFFFFFUL };
-    uint64_t Src, Line, ScopeCol;
-  public:
-    DebugLocTuple(uint64_t s, uint64_t l, uint64_t p, uint64_t c)
-      : Src(s), Line(l), Col((p << 32) | (c & Mask)) {};
+  struct DebugLocTuple {
+    unsigned Src, Line, Col;
 
-    uint64_t getSource() const {
-      return Src;
-    }
-    uint64_t getLine() const {
-      return Line;
-    }
-    uint32_t getScope() const {
-      return (ScopeCol >> 32) & Mask;
-    }
-    uint32_t getCol() const {
-      return ScopeCol & Mask;
-    }
+    DebugLocTuple(unsigned s, unsigned l, unsigned c)
+      : Src(s), Line(l), Col(c) {};
 
     bool operator==(const DebugLocTuple &DLT) const {
       return Src == DLT.Src && Line == DLT.Line && Col == DLT.Col;

Modified: llvm/branches/Apple/Dib/lib/Transforms/Utils/SimplifyCFG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/lib/Transforms/Utils/SimplifyCFG.cpp?rev=65308&r1=65307&r2=65308&view=diff

==============================================================================
--- llvm/branches/Apple/Dib/lib/Transforms/Utils/SimplifyCFG.cpp (original)
+++ llvm/branches/Apple/Dib/lib/Transforms/Utils/SimplifyCFG.cpp Mon Feb 23 00:58:20 2009
@@ -33,11 +33,6 @@
 
 STATISTIC(NumSpeculations, "Number of speculative executed instructions");
 
-#include "llvm/Support/CommandLine.h"
-
-static cl::opt<bool>
-DisableOpt("disable-opt", cl::Hidden, cl::init(false));
-
 /// SafeToMergeTerminators - Return true if it is safe to merge these two
 /// terminator instructions together.
 ///
@@ -1783,7 +1778,7 @@
       }
 
       // If we found some, do the transformation!
-      if (!UncondBranchPreds.empty() && !DisableOpt) {
+      if (!UncondBranchPreds.empty()) {
         while (!UncondBranchPreds.empty()) {
           BasicBlock *Pred = UncondBranchPreds.back();
           DOUT << "FOLDING: " << *BB