Fix bug caused by LowerSwitchPass.

yujack008 · Apr 19, 2020 · e3acd12 · e3acd12
1 parent 0a75aef
commit e3acd12
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 3 deletions.
diff --git a/Armariris/Enter.cpp b/Armariris/Enter.cpp
@@ -17,6 +17,9 @@ static void registerArmaririsModulePass(const PassManagerBuilder &,
 
 static void registerArmaririsFunctionPass(const PassManagerBuilder &,
                               legacy::PassManagerBase &PM) {
+#if LLVM_VERSION_MAJOR >= 9
+    PM.add(createLowerSwitchPass());
+#endif
     PM.add(createFlattening(true));
     PM.add(createSubstitution(true));
 }

diff --git a/Armariris/Flattening.cpp b/Armariris/Flattening.cpp
@@ -80,7 +80,8 @@ bool Flattening::flatten(Function *f) {
 
   // Lower switch
 #if LLVM_VERSION_MAJOR >= 9
-  // FIXME: Pass has not been inserted into a PassManager object!
+    // >=9.0, LowerSwitchPass depends on LazyValueInfoWrapperPass, which cause AssertError.
+    // So I move LowerSwitchPass into register function, just before FlatteningPass.
 #else
   FunctionPass *lower = createLowerSwitchPass();
   lower->runOnFunction(*f);

diff --git a/Hikari/Enter.cpp b/Hikari/Enter.cpp
@@ -17,6 +17,9 @@ static void registerHikariModulePass(const PassManagerBuilder &,
 static void registerHikariFunctionPass(const PassManagerBuilder &,
                               legacy::PassManagerBase &PM) {
     PM.add(createBogusControlFlowPass(true));
+#if LLVM_VERSION_MAJOR >= 9
+    PM.add(createLowerSwitchPass());
+#endif
     PM.add(createFlatteningPass(true));
     PM.add(createFunctionCallObfuscatePass(true));
     PM.add(createIndirectBranchPass(true));

diff --git a/Hikari/Flattening.cpp b/Hikari/Flattening.cpp
@@ -68,7 +68,8 @@ bool Flattening::flatten(Function *f) {
   // END OF SCRAMBLER
 
 #if LLVM_VERSION_MAJOR >= 9
-    // FIXME: Pass has not been inserted into a PassManager object!
+    // >=9.0, LowerSwitchPass depends on LazyValueInfoWrapperPass, which cause AssertError.
+    // So I move LowerSwitchPass into register function, just before FlatteningPass.
 #else
   FunctionPass *lower = createLowerSwitchPass();
   lower->runOnFunction(*f);

diff --git a/ollvm/Enter.cpp b/ollvm/Enter.cpp
@@ -14,6 +14,9 @@ using namespace llvm;
 static void registerOllvmPass(const PassManagerBuilder &,
                               legacy::PassManagerBase &PM) {
     PM.add(createBogus(true));
+#if LLVM_VERSION_MAJOR >= 9
+    PM.add(createLowerSwitchPass());
+#endif
     PM.add(createFlattening(true));
     PM.add(createSplitBasicBlock(true));
     PM.add(createSubstitution(true));

diff --git a/ollvm/Flattening.cpp b/ollvm/Flattening.cpp
@@ -67,7 +67,8 @@ bool Flattening::flatten(Function *f) {
 
   // Lower switch
 #if LLVM_VERSION_MAJOR >= 9
-    // FIXME: Pass has not been inserted into a PassManager object!
+    // >=9.0, LowerSwitchPass depends on LazyValueInfoWrapperPass, which cause AssertError.
+    // So I move LowerSwitchPass into register function, just before FlatteningPass.
 #else
   FunctionPass *lower = createLowerSwitchPass();
   lower->runOnFunction(*f);