@@ -298,8 +298,8 @@ class WebAssemblyLowerEmscriptenEHSjLj final : public ModulePass {
298
298
Function *ResumeF = nullptr ; // __resumeException() (Emscripten)
299
299
Function *EHTypeIDF = nullptr ; // llvm.eh.typeid.for() (intrinsic)
300
300
Function *EmLongjmpF = nullptr ; // emscripten_longjmp() (Emscripten)
301
- Function *SaveSetjmpF = nullptr ; // __wasm_setjmp() (Emscripten)
302
- Function *TestSetjmpF = nullptr ; // __wasm_setjmp_test() (Emscripten)
301
+ Function *WasmSetjmpF = nullptr ; // __wasm_setjmp() (Emscripten)
302
+ Function *WasmSetjmpTestF = nullptr ; // __wasm_setjmp_test() (Emscripten)
303
303
Function *WasmLongjmpF = nullptr ; // __wasm_longjmp() (Emscripten)
304
304
Function *CatchF = nullptr ; // wasm.catch() (intrinsic)
305
305
@@ -737,8 +737,8 @@ void WebAssemblyLowerEmscriptenEHSjLj::wrapTestSetjmp(
737
737
BasicBlock *EndBB2 = BasicBlock::Create (C, " if.end2" , F);
738
738
Value *ThrewPtr =
739
739
IRB.CreateIntToPtr (Threw, getAddrPtrType (M), Threw->getName () + " .p" );
740
- Value *ThenLabel =
741
- IRB. CreateCall (TestSetjmpF, {ThrewPtr, FunctionInvocationId}, " label" );
740
+ Value *ThenLabel = IRB. CreateCall (WasmSetjmpTestF,
741
+ {ThrewPtr, FunctionInvocationId}, " label" );
742
742
Value *Cmp2 = IRB.CreateICmpEQ (ThenLabel, IRB.getInt32 (0 ));
743
743
IRB.CreateCondBr (Cmp2, CallEmLongjmpBB, EndBB2);
744
744
@@ -999,11 +999,11 @@ bool WebAssemblyLowerEmscriptenEHSjLj::runOnModule(Module &M) {
999
999
FunctionType *FTy = FunctionType::get (
1000
1000
IRB.getVoidTy (), {SetjmpFTy->getParamType (0 ), Int32Ty, Int32PtrTy},
1001
1001
false );
1002
- SaveSetjmpF = getEmscriptenFunction (FTy, " __wasm_setjmp" , &M);
1002
+ WasmSetjmpF = getEmscriptenFunction (FTy, " __wasm_setjmp" , &M);
1003
1003
1004
1004
// Register __wasm_setjmp_test function
1005
1005
FTy = FunctionType::get (Int32Ty, {Int32PtrTy, Int32PtrTy}, false );
1006
- TestSetjmpF = getEmscriptenFunction (FTy, " __wasm_setjmp_test" , &M);
1006
+ WasmSetjmpTestF = getEmscriptenFunction (FTy, " __wasm_setjmp_test" , &M);
1007
1007
1008
1008
// wasm.catch() will be lowered down to wasm 'catch' instruction in
1009
1009
// instruction selection.
@@ -1049,7 +1049,7 @@ bool WebAssemblyLowerEmscriptenEHSjLj::runOnModule(Module &M) {
1049
1049
if (V && V->use_empty ())
1050
1050
V->eraseFromParent ();
1051
1051
for (auto *V : {GetTempRet0F, SetTempRet0F, ResumeF, EHTypeIDF, EmLongjmpF,
1052
- SaveSetjmpF, TestSetjmpF , WasmLongjmpF, CatchF})
1052
+ WasmSetjmpF, WasmSetjmpTestF , WasmLongjmpF, CatchF})
1053
1053
if (V && V->use_empty ())
1054
1054
V->eraseFromParent ();
1055
1055
@@ -1316,7 +1316,7 @@ bool WebAssemblyLowerEmscriptenEHSjLj::runSjLjOnFunction(Function &F) {
1316
1316
IRB.SetInsertPoint (CI);
1317
1317
Value *Args[] = {CI->getArgOperand (0 ), IRB.getInt32 (SetjmpRetPHIs.size ()),
1318
1318
FunctionInvocationId};
1319
- IRB.CreateCall (SaveSetjmpF , Args);
1319
+ IRB.CreateCall (WasmSetjmpF , Args);
1320
1320
ToErase.push_back (CI);
1321
1321
}
1322
1322
@@ -1619,7 +1619,7 @@ void WebAssemblyLowerEmscriptenEHSjLj::handleLongjmpableCallsForWasmSjLj(
1619
1619
BasicBlock *ThenBB = BasicBlock::Create (C, " if.then" , &F);
1620
1620
BasicBlock *EndBB = BasicBlock::Create (C, " if.end" , &F);
1621
1621
Value *EnvP = IRB.CreateBitCast (Env, getAddrPtrType (&M), " env.p" );
1622
- Value *Label = IRB.CreateCall (TestSetjmpF , {EnvP, FunctionInvocationId},
1622
+ Value *Label = IRB.CreateCall (WasmSetjmpTestF , {EnvP, FunctionInvocationId},
1623
1623
OperandBundleDef (" funclet" , CatchPad), " label" );
1624
1624
Value *Cmp = IRB.CreateICmpEQ (Label, IRB.getInt32 (0 ));
1625
1625
IRB.CreateCondBr (Cmp, ThenBB, EndBB);
0 commit comments