Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .clang-format
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
BasedOnStyle: LLVM
LineEnding: LF
1 change: 0 additions & 1 deletion llvm/.clang-format
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
BasedOnStyle: LLVM
LineEnding: LF
19 changes: 12 additions & 7 deletions llvm/include/llvm/IR/DebugInfoMetadata.h
Original file line number Diff line number Diff line change
Expand Up @@ -2600,14 +2600,19 @@ class DILocation : public MDNode {
StringRef getDirectory() const { return getScope()->getDirectory(); }
std::optional<StringRef> getSource() const { return getScope()->getSource(); }

/// Get the scope where this is inlined.
///
/// Walk through \a getInlinedAt() and return \a getScope() from the deepest
/// location.
/// Walk through \a getInlinedAt() and return the \a DILocation of the
/// outermost call site in the inlining chain.
const DILocation *getInlinedAtLocation() const {
const DILocation *Current = this;
while (const DILocation *Next = Current->getInlinedAt())
Current = Next;
return Current;
}

// Return the \a DILocalScope of the outermost call site in the inlining
// chain.
DILocalScope *getInlinedAtScope() const {
if (auto *IA = getInlinedAt())
return IA->getInlinedAtScope();
return getScope();
return getInlinedAtLocation()->getScope();
}

/// Get the DWARF discriminator.
Expand Down
76 changes: 76 additions & 0 deletions llvm/unittests/IR/DebugInfoTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1367,4 +1367,80 @@ TEST(DIBuilder, DynamicOffsetAndSize) {
EXPECT_EQ(Field->getRawSizeInBits(), Len);
}

TEST(DILocationTest, InlinedAtMethodsWithMultipleLevels) {
LLVMContext C;

// Create IR with 3 levels of inlining:
// main() calls inline1() which calls inline2() which calls inline3()
// We'll test from the perspective of code in inline3()
std::unique_ptr<Module> M = parseIR(C, R"(
define void @main() !dbg !10 {
ret void, !dbg !20
}

!llvm.dbg.cu = !{!0}
!llvm.module.flags = !{!2}

!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1)
!1 = !DIFile(filename: "test.c", directory: "/test")
!2 = !{i32 2, !"Debug Info Version", i32 3}

; Subprograms for each function in the call chain
!10 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 100, unit: !0)
!11 = distinct !DISubprogram(name: "inline1", scope: !1, file: !1, line: 200, unit: !0)
!12 = distinct !DISubprogram(name: "inline2", scope: !1, file: !1, line: 300, unit: !0)
!13 = distinct !DISubprogram(name: "inline3", scope: !1, file: !1, line: 400, unit: !0)

; Location in inline3 (line 401), inlined at location !21
!20 = !DILocation(line: 401, column: 5, scope: !13, inlinedAt: !21)

; Location in inline2 (line 301) where inline3 was called, inlined at !22
!21 = !DILocation(line: 301, column: 10, scope: !12, inlinedAt: !22)

; Location in inline1 (line 201) where inline2 was called, inlined at !23
!22 = !DILocation(line: 201, column: 15, scope: !11, inlinedAt: !23)

; Location in main (line 101) where inline1 was called (no more inlinedAt)
!23 = !DILocation(line: 101, column: 3, scope: !10)
)");

ASSERT_TRUE(M);

Function *MainFunc = M->getFunction("main");
ASSERT_TRUE(MainFunc);
Instruction &RetInst = MainFunc->getEntryBlock().front();

// Use getDebugLoc() to get the location from the ret instruction.
const DILocation *InnermostLoc = RetInst.getDebugLoc().get();
ASSERT_TRUE(InnermostLoc);

// Test getScope() - should return the immediate scope (inline3).
DILocalScope *ImmediateScope = InnermostLoc->getScope();
ASSERT_TRUE(ImmediateScope);
EXPECT_TRUE(isa<DISubprogram>(ImmediateScope));
EXPECT_EQ(cast<DISubprogram>(ImmediateScope)->getName(), "inline3");

// Test getInlinedAt() - should return the next level in the inlining chain.
const DILocation *NextLevel = InnermostLoc->getInlinedAt();
ASSERT_TRUE(NextLevel);
EXPECT_EQ(NextLevel->getLine(), 301u);
EXPECT_EQ(cast<DISubprogram>(NextLevel->getScope())->getName(), "inline2");

// Test getInlinedAtLocation() - should return the outermost location.
const DILocation *OutermostLoc = InnermostLoc->getInlinedAtLocation();
ASSERT_TRUE(OutermostLoc);
EXPECT_EQ(OutermostLoc->getLine(), 101u);
EXPECT_EQ(OutermostLoc->getColumn(), 3u);
EXPECT_EQ(OutermostLoc->getInlinedAt(), nullptr);
EXPECT_EQ(cast<DISubprogram>(OutermostLoc->getScope())->getName(), "main");

// Test getInlinedAtScope() - should return the scope of the outermost
// location.
DILocalScope *InlinedAtScope = InnermostLoc->getInlinedAtScope();
ASSERT_TRUE(InlinedAtScope);
EXPECT_TRUE(isa<DISubprogram>(InlinedAtScope));
EXPECT_EQ(cast<DISubprogram>(InlinedAtScope)->getName(), "main");
EXPECT_EQ(InlinedAtScope, OutermostLoc->getScope());
}

} // end namespace
Loading