diff --git a/llvm/lib/CheerpUtils/CheerpLowerAtomic.cpp b/llvm/lib/CheerpUtils/CheerpLowerAtomic.cpp
index 978d677aee85..3dba4943584f 100644
--- a/llvm/lib/CheerpUtils/CheerpLowerAtomic.cpp
+++ b/llvm/lib/CheerpUtils/CheerpLowerAtomic.cpp
@@ -12,8 +12,7 @@ using namespace cheerp;
 PreservedAnalyses CheerpLowerAtomicPass::run(Module& M, ModuleAnalysisManager& MAM)
 {
 	FunctionAnalysisManager& FAM = MAM.getResult<FunctionAnalysisManagerModuleProxy>(M).getManager();
-	FunctionPassManager FPM;
-	FPM.addPass(LowerAtomicPass());
+	LowerAtomicPass LAP;
 
 	// Loop over the functions, and only pass genericjs ones to LowerAtomicPass
 	for (Function& F : M)
@@ -24,7 +23,7 @@ PreservedAnalyses CheerpLowerAtomicPass::run(Module& M, ModuleAnalysisManager& M
 		if (!LowerAtomics && F.getSection() == "asmjs")
 			continue;
 
-		FPM.run(F, FAM);
+		LAP.run(F, FAM);
 	}
 
 	// Replace thread locals with actual globals
diff --git a/llvm/lib/CheerpUtils/LowerGlobalDestructors.cpp b/llvm/lib/CheerpUtils/LowerGlobalDestructors.cpp
index 35293423234f..11d759abd64c 100644
--- a/llvm/lib/CheerpUtils/LowerGlobalDestructors.cpp
+++ b/llvm/lib/CheerpUtils/LowerGlobalDestructors.cpp
@@ -64,8 +64,7 @@ void LowerGlobalDestructorsPass::filterGenericJSDestructors(Module& M)
 
 PreservedAnalyses LowerGlobalDestructorsPass::run(Module& M, ModuleAnalysisManager& MAM)
 {
-	ModulePassManager MPM;
-	MPM.addPass(LowerGlobalDtorsPass());
+	LowerGlobalDtorsPass LGDP;
 
 	// Collect all currently existing functions in a set.
 	std::unordered_set<Function*> functionsBeforePass;
@@ -76,7 +75,7 @@ PreservedAnalyses LowerGlobalDestructorsPass::run(Module& M, ModuleAnalysisManag
 	filterGenericJSDestructors(M);
 
 	// Run the LowerGlobalDtorsPass.
-	PreservedAnalyses PA = MPM.run(M, MAM);
+	PreservedAnalyses PA = LGDP.run(M, MAM);
 
 	// The functions that weren't in the list before are the new functions
 	// created by the LowerGlobalDtorsPass. Tag them asmjs.