XXX: StructCFG disable

2 files changed, 14 insertions, 5 deletions

diff --git a/include/llvm/Transforms/Scalar.h b/include/llvm/Transforms/Scalar.h
index 5c703966eb1..57da5f5ae3f 100644
--- a/include/llvm/Transforms/Scalar.h
+++ b/include/llvm/Transforms/Scalar.h
@@ -262,7 +262,7 @@ FunctionPass *createFlattenCFGPass();
 //
 // CFG Structurization - Remove irreducible control flow
 //
-Pass *createStructurizeCFGPass();
+Pass *createStructurizeCFGPass(bool *DisablePass = nullptr);
 
 //===----------------------------------------------------------------------===//
 //
diff --git a/lib/Transforms/Scalar/StructurizeCFG.cpp b/lib/Transforms/Scalar/StructurizeCFG.cpp
index 28812a45719..800664b3aac 100644
--- a/lib/Transforms/Scalar/StructurizeCFG.cpp
+++ b/lib/Transforms/Scalar/StructurizeCFG.cpp
@@ -161,6 +161,8 @@ public:
 /// consist of a network of PHI nodes where the true incoming values expresses
 /// breaks and the false values expresses continue states.
 class StructurizeCFG : public RegionPass {
+  bool *DisablePass;
+
   Type *Boolean;
   ConstantInt *BoolTrue;
   ConstantInt *BoolFalse;
@@ -236,7 +238,14 @@ public:
   static char ID;
 
   StructurizeCFG() :
-    RegionPass(ID) {
+    RegionPass(ID),
+    DisablePass(nullptr) {
+    initializeStructurizeCFGPass(*PassRegistry::getPassRegistry());
+  }
+
+  StructurizeCFG(bool *DisablePass) :
+    RegionPass(ID),
+    DisablePass(DisablePass) {
     initializeStructurizeCFGPass(*PassRegistry::getPassRegistry());
   }
 
@@ -916,7 +925,7 @@ void StructurizeCFG::rebuildSSA() {
 
 /// \brief Run the transformation for each region found
 bool StructurizeCFG::runOnRegion(Region *R, RGPassManager &RGM) {
-  if (R->isTopLevelRegion())
+  if (R->isTopLevelRegion() || (DisablePass && *DisablePass))
     return false;
 
   Func = R->getEntry()->getParent();
@@ -948,6 +957,6 @@ bool StructurizeCFG::runOnRegion(Region *R, RGPassManager &RGM) {
 }
 
 /// \brief Create the pass
-Pass *llvm::createStructurizeCFGPass() {
-  return new StructurizeCFG();
+Pass *llvm::createStructurizeCFGPass(bool *DisablePass) {
+  return new StructurizeCFG(DisablePass);
 }