diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyLowerEmscriptenEHSjLj.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyLowerEmscriptenEHSjLj.cpp --- a/llvm/lib/Target/WebAssembly/WebAssemblyLowerEmscriptenEHSjLj.cpp +++ b/llvm/lib/Target/WebAssembly/WebAssemblyLowerEmscriptenEHSjLj.cpp @@ -259,7 +259,7 @@ Function *getFindMatchingCatch(Module &M, unsigned NumClauses); template Value *wrapInvoke(CallOrInvoke *CI); - void wrapTestSetjmp(BasicBlock *BB, Instruction *InsertPt, Value *Threw, + void wrapTestSetjmp(BasicBlock *BB, DebugLoc DL, Value *Threw, Value *SetjmpTable, Value *SetjmpTableSize, Value *&Label, Value *&LongjmpResult, BasicBlock *&EndBB); template Function *getInvokeWrapper(CallOrInvoke *CI); @@ -538,13 +538,13 @@ // As output parameters. returns %label, %longjmp_result, and the BB the last // instruction (%longjmp_result = ...) is in. void WebAssemblyLowerEmscriptenEHSjLj::wrapTestSetjmp( - BasicBlock *BB, Instruction *InsertPt, Value *Threw, Value *SetjmpTable, + BasicBlock *BB, DebugLoc DL, Value *Threw, Value *SetjmpTable, Value *SetjmpTableSize, Value *&Label, Value *&LongjmpResult, BasicBlock *&EndBB) { Function *F = BB->getParent(); LLVMContext &C = BB->getModule()->getContext(); IRBuilder<> IRB(C); - IRB.SetInsertPoint(InsertPt); + IRB.SetCurrentDebugLocation(DL); // if (%__THREW__.val != 0 & threwValue != 0) IRB.SetInsertPoint(BB); @@ -891,13 +891,22 @@ // this instruction to a constant 4, because this value will be used in // SSAUpdater.AddAvailableValue(...) later. BasicBlock &EntryBB = F.getEntryBlock(); + DebugLoc FirstDL = EntryBB.begin()->getDebugLoc(); BinaryOperator *SetjmpTableSize = BinaryOperator::Create( Instruction::Add, IRB.getInt32(4), IRB.getInt32(0), "setjmpTableSize", &*EntryBB.getFirstInsertionPt()); + SetjmpTableSize->setDebugLoc(FirstDL); // setjmpTable = (int *) malloc(40); Instruction *SetjmpTable = CallInst::CreateMalloc( SetjmpTableSize, IRB.getInt32Ty(), IRB.getInt32Ty(), IRB.getInt32(40), nullptr, nullptr, "setjmpTable"); + SetjmpTable->setDebugLoc(FirstDL); + // CallInst::CreateMalloc may return a bitcast instruction if the result types + // mismatch. We need to set the debug loc for the original call too. + auto *MallocCall = SetjmpTable->stripPointerCasts(); + if (auto *MallocCallI = dyn_cast(MallocCall)) { + MallocCallI->setDebugLoc(FirstDL); + } // setjmpTable[0] = 0; IRB.SetInsertPoint(SetjmpTableSize); IRB.CreateStore(IRB.getInt32(0), SetjmpTable); @@ -1027,12 +1036,13 @@ Value *Label = nullptr; Value *LongjmpResult = nullptr; BasicBlock *EndBB = nullptr; - wrapTestSetjmp(BB, CI, Threw, SetjmpTable, SetjmpTableSize, Label, - LongjmpResult, EndBB); + wrapTestSetjmp(BB, CI->getDebugLoc(), Threw, SetjmpTable, SetjmpTableSize, + Label, LongjmpResult, EndBB); assert(Label && LongjmpResult && EndBB); // Create switch instruction IRB.SetInsertPoint(EndBB); + IRB.SetCurrentDebugLocation(EndBB->getInstList().back().getDebugLoc()); SwitchInst *SI = IRB.CreateSwitch(Label, Tail, SetjmpRetPHIs.size()); // -1 means no longjmp happened, continue normally (will hit the default // switch case). 0 means a longjmp that is not ours to handle, needs a @@ -1056,8 +1066,16 @@ // Free setjmpTable buffer before each return instruction for (BasicBlock &BB : F) { Instruction *TI = BB.getTerminator(); - if (isa(TI)) - CallInst::CreateFree(SetjmpTable, TI); + if (isa(TI)) { + auto *Free = CallInst::CreateFree(SetjmpTable, TI); + Free->setDebugLoc(TI->getDebugLoc()); + // CallInst::CreateFree may create a bitcast instruction if its argument + // types mismatch. We need to set the debug loc for the bitcast too. + if (auto *FreeCallI = dyn_cast(Free)) { + if (auto *BitCastI = dyn_cast(FreeCallI->getArgOperand(0))) + BitCastI->setDebugLoc(TI->getDebugLoc()); + } + } } // Every call to saveSetjmp can change setjmpTable and setjmpTableSize diff --git a/llvm/test/CodeGen/WebAssembly/lower-em-sjlj.ll b/llvm/test/CodeGen/WebAssembly/lower-em-sjlj.ll --- a/llvm/test/CodeGen/WebAssembly/lower-em-sjlj.ll +++ b/llvm/test/CodeGen/WebAssembly/lower-em-sjlj.ll @@ -5,12 +5,12 @@ %struct.__jmp_buf_tag = type { [6 x i32], i32, [32 x i32] } -@global_var = hidden global i32 0, align 4 +@global_var = global i32 0, align 4 ; CHECK-DAG: __THREW__ = external global i32 ; CHECK-DAG: __threwValue = external global i32 ; Test a simple setjmp - longjmp sequence -define hidden void @setjmp_longjmp() { +define void @setjmp_longjmp() { ; CHECK-LABEL: @setjmp_longjmp entry: %buf = alloca [1 x %struct.__jmp_buf_tag], align 16 @@ -73,7 +73,7 @@ } ; Test a case of a function call (which is not longjmp) after a setjmp -define hidden void @setjmp_other() { +define void @setjmp_other() { ; CHECK-LABEL: @setjmp_other entry: %buf = alloca [1 x %struct.__jmp_buf_tag], align 16 @@ -94,7 +94,7 @@ } ; Test a case when a function call is within try-catch, after a setjmp -define hidden void @exception_and_longjmp() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) { +define void @exception_and_longjmp() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) { ; CHECK-LABEL: @exception_and_longjmp entry: %buf = alloca [1 x %struct.__jmp_buf_tag], align 16 @@ -132,7 +132,7 @@ } ; Test SSA validity -define hidden void @ssa(i32 %n) { +define void @ssa(i32 %n) { ; CHECK-LABEL: @ssa entry: %buf = alloca [1 x %struct.__jmp_buf_tag], align 16 @@ -170,7 +170,7 @@ } ; Test a case when a function only calls other functions that are neither setjmp nor longjmp -define hidden void @only_other_func() { +define void @only_other_func() { entry: call void @foo() ret void @@ -178,7 +178,7 @@ } ; Test a case when a function only calls longjmp and not setjmp -define hidden void @only_longjmp() { +define void @only_longjmp() { entry: %buf = alloca [1 x %struct.__jmp_buf_tag], align 16 %arraydecay = getelementptr inbounds [1 x %struct.__jmp_buf_tag], [1 x %struct.__jmp_buf_tag]* %buf, i32 0, i32 0 @@ -189,7 +189,7 @@ } ; Test inline asm handling -define hidden void @inline_asm() { +define void @inline_asm() { ; CHECK-LABEL: @inline_asm entry: %env = alloca [1 x %struct.__jmp_buf_tag], align 16 @@ -205,7 +205,7 @@ ; Test that the allocsize attribute is being transformed properly declare i8 *@allocator(i32, %struct.__jmp_buf_tag*) #3 -define hidden i8 *@allocsize() { +define i8 *@allocsize() { ; CHECK-LABEL: @allocsize entry: %buf = alloca [1 x %struct.__jmp_buf_tag], align 16 @@ -246,6 +246,43 @@ ; CHECK: %var[[VARNO]] = phi i32 [ %var, %for.inc ] } +; Debug info test +define void @setjmp_debug_info() !dbg !3 { +; CHECK-LABEL: @setjmp_debug_info +entry: + %buf = alloca [1 x %struct.__jmp_buf_tag], align 16, !dbg !4 + %arraydecay = getelementptr inbounds [1 x %struct.__jmp_buf_tag], [1 x %struct.__jmp_buf_tag]* %buf, i32 0, i32 0, !dbg !5 + %call = call i32 @setjmp(%struct.__jmp_buf_tag* %arraydecay) #0, !dbg !6 + call void @foo(), !dbg !7 + ret void, !dbg !8 +; CHECK: entry: + ; CHECK-NEXT: call i8* @malloc(i32 40), !dbg ![[DL0:.*]] + ; CHECK-NEXT: bitcast {{.*}}, !dbg ![[DL0]] + ; CHECK: alloca {{.*}}, !dbg ![[DL0]] + ; CHECK: call i32* @saveSetjmp{{.*}}, !dbg ![[DL1:.*]] + ; CHECK-NEXT: call i32 @getTempRet0{{.*}}, !dbg ![[DL1]] + ; CHECK-NEXT: br {{.*}}, !dbg ![[DL2:.*]] + +; CHECK: entry.split: + ; CHECK: call {{.*}} void @__invoke_void{{.*}}, !dbg ![[DL2]] + +; CHECK: entry.split.split: + ; CHECK-NEXT: bitcast {{.*}}, !dbg ![[DL3:.*]] + ; CHECK-NEXT: call void @free{{.*}}, !dbg ![[DL3]] + +; CHECK: if.then1: + ; CHECK: call i32 @testSetjmp{{.*}}, !dbg ![[DL2]] + +; CHECK: if.end: + ; CHECK: call i32 @getTempRet0{{.*}}, !dbg ![[DL2]] + +; CHECK: if.then2: + ; CHECK: call void @emscripten_longjmp{{.*}}, !dbg ![[DL2]] + +; CHECK: if.end2: + ; CHECK: call void @setTempRet0{{.*}}, !dbg ![[DL2]] +} + declare void @foo() ; Function Attrs: returns_twice declare i32 @setjmp(%struct.__jmp_buf_tag*) #0 @@ -272,3 +309,16 @@ attributes #2 = { nounwind } attributes #3 = { allocsize(0) } ; CHECK: attributes #[[ALLOCSIZE_ATTR]] = { allocsize(1) } + +!llvm.dbg.cu = !{!2} +!llvm.module.flags = !{!0} + +!0 = !{i32 2, !"Debug Info Version", i32 3} +!1 = !DIFile(filename: "lower-em-sjlj.c", directory: "test") +!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1) +!3 = distinct !DISubprogram(name: "setjmp_debug_info", unit:!2, file: !1, line: 1) +!4 = !DILocation(line:2, scope: !3) +!5 = !DILocation(line:3, scope: !3) +!6 = !DILocation(line:4, scope: !3) +!7 = !DILocation(line:5, scope: !3) +!8 = !DILocation(line:6, scope: !3)