diff options
Diffstat (limited to 'lib/Transforms')
| -rw-r--r-- | lib/Transforms/Scalar/ScalarReplAggregates.cpp | 2 | ||||
| -rw-r--r-- | lib/Transforms/Utils/SimplifyCFG.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/Transforms/Scalar/ScalarReplAggregates.cpp b/lib/Transforms/Scalar/ScalarReplAggregates.cpp index ee4b87227a..93830b1f51 100644 --- a/lib/Transforms/Scalar/ScalarReplAggregates.cpp +++ b/lib/Transforms/Scalar/ScalarReplAggregates.cpp @@ -255,7 +255,7 @@ bool SROA::performScalarRepl(Function &F) { uint64_t AllocaSize = TD->getTypePaddedSize(AI->getAllocatedType()); // Do not promote any struct whose size is too big. - if (AllocaSize >= SRThreshold) continue; + if (AllocaSize > SRThreshold) continue; if ((isa<StructType>(AI->getAllocatedType()) || isa<ArrayType>(AI->getAllocatedType())) && diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp index 25579614ec..96cd299242 100644 --- a/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/lib/Transforms/Utils/SimplifyCFG.cpp @@ -33,6 +33,10 @@ using namespace llvm; STATISTIC(NumSpeculations, "Number of speculative executed instructions"); +#include "llvm/Support/CommandLine.h" +static cl::opt<bool> +DisableXForm("disable-xform", cl::Hidden, cl::init(false)); + /// SafeToMergeTerminators - Return true if it is safe to merge these two /// terminator instructions together. /// @@ -1782,7 +1786,7 @@ bool llvm::SimplifyCFG(BasicBlock *BB) { } // If we found some, do the transformation! - if (!UncondBranchPreds.empty()) { + if (!UncondBranchPreds.empty() && !DisableXForm) { while (!UncondBranchPreds.empty()) { BasicBlock *Pred = UncondBranchPreds.back(); DOUT << "FOLDING: " << *BB |