Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[DebugInfo] Give inlinable calls DILocs (PR39807)
In PR39807 we incorrectly handle circumstances where calls are common'd from conditional blocks into the parent BB. Calls that can be inlined must always have DebugLocs, however we strip them during commoning, which the IR verifier asserts on. Fix this by using applyMergedLocation: it will perform the same DebugLoc stripping of conditional Locs, but will also generate an unknown location DebugLoc that satisfies the requirement for inlinable calls to always have locations. Some of the prior logic for selecting a DebugLoc is now likely redundant; I'll generate a follow-up to remove it (involves editing more regression tests). Differential Revision: https://reviews.llvm.org/D54997 llvm-svn: 347782
- Loading branch information
Showing
2 changed files
with
52 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
; RUN: opt -S -simplifycfg < %s | FileCheck %s | ||
|
||
declare void @personality() | ||
|
||
define void @test(i1 %b) personality void()* @personality !dbg !1 { | ||
; CHECK: invoke void @inlinable() | ||
; CHECK-NEXT: to label %success unwind label %failure, !dbg ![[DBGLOC:[0-9]+]] | ||
br i1 %b, label %if, label %else | ||
|
||
if: | ||
invoke void @inlinable() | ||
to label %success unwind label %failure, !dbg !2 | ||
|
||
else: | ||
invoke void @inlinable() | ||
to label %success unwind label %failure, !dbg !8 | ||
|
||
success: | ||
ret void | ||
|
||
failure: | ||
landingpad {} | ||
cleanup | ||
ret void | ||
} | ||
|
||
define internal void @inlinable() !dbg !7 { | ||
ret void | ||
} | ||
|
||
!llvm.dbg.cu = !{!0} | ||
!llvm.module.flags = !{!4, !5, !6} | ||
|
||
; CHECK: ![[DBGLOC]] = !DILocation(line: 0 | ||
!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, runtimeVersion: 0, file: !3) | ||
!1 = distinct !DISubprogram(name: "test", unit: !0) | ||
!2 = !DILocation(line: 2, scope: !1) | ||
!3 = !DIFile(filename: "foo", directory: ".") | ||
!4 = !{i32 2, !"Dwarf Version", i32 4} | ||
!5 = !{i32 2, !"Debug Info Version", i32 3} | ||
!6 = !{i32 1, !"wchar_size", i32 4} | ||
!7 = distinct !DISubprogram(name: "inlinable", unit: !0) | ||
!8 = !DILocation(line: 3, scope: !1) |