mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-17 18:26:37 +00:00
Code Issues Projects Releases Wiki Activity

[MLIR][LLVM] Fix debug value/declare import in face of landing pads (#132871)

Browse Source 
Debug value/declare operations imported before landing pad operations at
the bb start break invoke op verification:

```
error: first operation in unwind destination should be a llvm.landingpad operation
```

This this issue by making the placement slightly more smart.
This commit is contained in:
Bruno Cardoso Lopes 2025-03-25 13:15:51 -07:00 committed by GitHub
parent 9aecbdf8ed
commit e7e242e7ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mlir/lib/Target/LLVMIR/ModuleImport.cpp
View File

@ -2512,7 +2512,19 @@ ModuleImport::processDebugIntrinsic(llvm::DbgVariableIntrinsic *dbgIntr,
Block *dominatedBlock = (*dominatedBlocks.begin())->getBlock();
builder.setInsertionPoint(dominatedBlock->getTerminator());
} else {
builder.setInsertionPointAfterValue(*argOperand);
Value insertPt = *argOperand;
if (auto blockArg = dyn_cast<BlockArgument>(*argOperand)) {
// The value might be coming from a phi node and is now a block argument,
// which means the insertion point is set to the start of the block. If
// this block is a target destination of an invoke, the insertion point
// must happen after the landing pad operation.
Block *insertionBlock = argOperand->getParentBlock();
if (!insertionBlock->empty() &&
isa<LandingpadOp>(insertionBlock->front()))
insertPt = cast<LandingpadOp>(insertionBlock->front()).getRes();
}
builder.setInsertionPointAfterValue(insertPt);
}
auto locationExprAttr =
debugImporter->translateExpression(dbgIntr->getExpression());

44
mlir/test/Target/LLVMIR/Import/exception.ll
View File

@ -1,4 +1,4 @@
; RUN: mlir-translate -import-llvm %s | FileCheck %s
; RUN: mlir-translate -import-llvm -split-input-file %s | FileCheck %s
@_ZTIi = external dso_local constant ptr
@_ZTIii= external dso_local constant ptr
@ -148,3 +148,45 @@ exit:
; CHECK: llvm.return
ret void
}
; // -----
declare i32 @__gxx_personality_v0(...)
declare void @foo(ptr)
; CHECK-LABEL: @invokeLandingpad
define i32 @invokeLandingpad(ptr %addr) personality ptr @__gxx_personality_v0 {
entry:
%1 = alloca i8
%zzz = load i32, ptr %addr, align 4
invoke void @foo(ptr %1) to label %bb1 unwind label %bb2
bb1:
%yyy = load i32, ptr %addr, align 4
invoke void @foo(ptr %1) to label %bb3 unwind label %bb2
; CHECK: ^bb{{.*}}(%[[ARG:.*]]: i32):
bb2:
%phi_var = phi i32 [ %zzz, %entry ], [ %yyy, %bb1 ], !dbg !5
; CHECK: llvm.landingpad cleanup : !llvm.struct<(ptr, i32)>
; CHECK-NEXT: llvm.intr.dbg.value #di_local_variable #llvm.di_expression<[DW_OP_LLVM_fragment(64, 64)]> = %[[ARG]] : i32
%3 = landingpad { ptr, i32 } cleanup, !dbg !5
#dbg_value(i32 %phi_var, !8, !DIExpression(DW_OP_LLVM_fragment, 64, 64), !7)
br label %bb3
bb3:
; CHECK: llvm.return %{{[0-9]+}} : i32
ret i32 1
}
!llvm.dbg.cu = !{!1}
!llvm.module.flags = !{!0}
!0 = !{i32 2, !"Debug Info Version", i32 3}
!1 = distinct !DICompileUnit(language: DW_LANG_C, file: !2)
!2 = !DIFile(filename: "landingpad.ll", directory: "/")
!3 = distinct !DISubprogram(name: "instruction_loc", scope: !2, file: !2, spFlags: DISPFlagDefinition, unit: !1)
!4 = distinct !DISubprogram(name: "callee", scope: !2, file: !2, spFlags: DISPFlagDefinition, unit: !1)
!5 = !DILocation(line: 1, column: 2, scope: !3)
!6 = !DILocation(line: 2, column: 2, scope: !3)
!7 = !DILocation(line: 7, column: 4, scope: !4, inlinedAt: !6)
!8 = !DILocalVariable(scope: !4, name: "size")