Run InvokeWrappingPass before AllocaLoweringPass

When rewriting calls to variadic functions, AllocaLowering only handles call instructions, not invoke instructions. By moving InvokeWrapping before AllocaLowering, the problematic invokes are converted to calls before AllocaLowering is run.
leaningtech · Jun 25, 2024 · bd1858b · bd1858b
1 parent 4929594
commit bd1858b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/llvm/lib/CheerpUtils/AllocaLowering.cpp b/llvm/lib/CheerpUtils/AllocaLowering.cpp
@@ -308,6 +308,7 @@ PreservedAnalyses cheerp::AllocaLoweringInnerPass::run(Function& F, FunctionAnal
 	PA.preserve<RegisterizeAnalysis>();
 	PA.preserve<GlobalDepsAnalysis>();
 	PA.preserve<DominatorTreeAnalysis>();
+	PA.preserve<InvokeWrappingAnalysis>();
 	return PA;
 }
 

diff --git a/llvm/lib/Target/CheerpBackend/CheerpWritePass.cpp b/llvm/lib/Target/CheerpBackend/CheerpWritePass.cpp
@@ -249,9 +249,9 @@ bool CheerpWritePass::runOnModule(Module& M)
 
   MPM.addPass(cheerp::FreeAndDeleteRemovalPass());
   MPM.addPass(cheerp::GlobalDepsAnalyzerPass(mathMode, /*resolveAliases*/true));
+  MPM.addPass(cheerp::InvokeWrappingPass());
   if (isWasmTarget)
     MPM.addPass(cheerp::AllocaLoweringPass());
-  MPM.addPass(cheerp::InvokeWrappingPass());
   MPM.addPass(cheerp::FFIWrappingPass());
   MPM.addPass(createModuleToFunctionPassAdaptor(cheerp::FixIrreducibleControlFlowPass()));
   MPM.addPass(createModuleToFunctionPassAdaptor(cheerp::PointerArithmeticToArrayIndexingPass()));