Skip to content

Commit 8115e08

Browse files
author
Davide Italiano
committed
[MachineCSE] Don't carry the wrong ___location when hoisting
PR: 45425 <rdar://problem/61359768> Differential Revision: https://reviews.llvm.org/D77604
1 parent 9f09550 commit 8115e08

File tree

2 files changed

+87
-0
lines changed

2 files changed

+87
-0
lines changed

llvm/lib/CodeGen/MachineCSE.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -831,6 +831,13 @@ bool MachineCSE::ProcessBlockPRE(MachineDominatorTree *DT,
831831
continue;
832832
MachineInstr &NewMI =
833833
TII->duplicate(*CMBB, CMBB->getFirstTerminator(), *MI);
834+
835+
// When hoisting, make sure we don't carry the debug ___location of
836+
// the original instruction, as that's not correct and can cause
837+
// unexpected jumps when debugging optimized code.
838+
auto EmptyDL = DebugLoc();
839+
NewMI.setDebugLoc(EmptyDL);
840+
834841
NewMI.getOperand(0).setReg(NewReg);
835842

836843
PREMap[MI] = CMBB;
Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
; RUN: llc %s -o - -print-after=machine-cse -mtriple=x86_64-- 2>&1 | FileCheck %s --match-full-lines
2+
3+
; CHECK: %5:gr32 = SUB32ri8 %0:gr32(tied-def 0), 1, implicit-def $eflags, debug-___location !24; a.c:3:13
4+
; CHECK-NEXT: %10:gr32 = MOVSX32rr8 %4:gr8
5+
; CHECK-NEXT: JCC_1 %bb.2, 15, implicit $eflags, debug-___location !25; a.c:3:18
6+
7+
target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
8+
target triple = "x86_64-apple-macosx10.15.0"
9+
10+
@a = local_unnamed_addr global i32 0, align 4, !dbg !0
11+
12+
; Function Attrs: norecurse nounwind readonly ssp uwtable
13+
define i32 @b(i8 signext %0) local_unnamed_addr #0 !dbg !12 {
14+
call void @llvm.dbg.value(metadata i8 %0, metadata !17, metadata !DIExpression()), !dbg !18
15+
%2 = load i32, i32* @a, align 4, !dbg !19, !tbaa !20
16+
%3 = icmp sgt i32 %2, 1, !dbg !24
17+
br i1 %3, label %8, label %4, !dbg !25
18+
19+
4: ; preds = %1
20+
%5 = sext i8 %0 to i32, !dbg !26
21+
%6 = ashr i32 %5, %2, !dbg !27
22+
%7 = icmp eq i32 %6, 0, !dbg !27
23+
br i1 %7, label %10, label %8, !dbg !28
24+
25+
8: ; preds = %4, %1
26+
%9 = sext i8 %0 to i32, !dbg !29
27+
br label %10, !dbg !28
28+
29+
10: ; preds = %4, %8
30+
%11 = phi i32 [ %9, %8 ], [ 0, %4 ], !dbg !28
31+
ret i32 %11, !dbg !30
32+
}
33+
34+
define i32 @main() local_unnamed_addr #0 !dbg !31 {
35+
%1 = call i32 @b(i8 signext 0), !dbg !34
36+
ret i32 %1, !dbg !35
37+
}
38+
39+
declare void @llvm.dbg.value(metadata, metadata, metadata) #1
40+
41+
!llvm.dbg.cu = !{!2}
42+
!llvm.module.flags = !{!7, !8, !9, !10}
43+
!llvm.ident = !{!11}
44+
45+
!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
46+
!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
47+
!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 11.0.0 (https://github.com/llvm/llvm-project 75cfd382201978615cca1c91c2d9f14f8b7af56d)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None, sysroot: "/")
48+
!3 = !DIFile(filename: "a.c", directory: "/Users/davide/work/build/bin")
49+
!4 = !{}
50+
!5 = !{!0}
51+
!6 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
52+
!7 = !{i32 7, !"Dwarf Version", i32 4}
53+
!8 = !{i32 2, !"Debug Info Version", i32 3}
54+
!9 = !{i32 1, !"wchar_size", i32 4}
55+
!10 = !{i32 7, !"PIC Level", i32 2}
56+
!11 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project 75cfd382201978615cca1c91c2d9f14f8b7af56d)"}
57+
!12 = distinct !DISubprogram(name: "b", scope: !3, file: !3, line: 2, type: !13, scopeLine: 2, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !16)
58+
!13 = !DISubroutineType(types: !14)
59+
!14 = !{!6, !15}
60+
!15 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
61+
!16 = !{!17}
62+
!17 = !DILocalVariable(name: "c", arg: 1, scope: !12, file: !3, line: 2, type: !15)
63+
!18 = !DILocation(line: 0, scope: !12)
64+
!19 = !DILocation(line: 3, column: 11, scope: !12)
65+
!20 = !{!21, !21, i64 0}
66+
!21 = !{!"int", !22, i64 0}
67+
!22 = !{!"omnipotent char", !23, i64 0}
68+
!23 = !{!"Simple C/C++ TBAA"}
69+
!24 = !DILocation(line: 3, column: 13, scope: !12)
70+
!25 = !DILocation(line: 3, column: 18, scope: !12)
71+
!26 = !DILocation(line: 3, column: 21, scope: !12)
72+
!27 = !DILocation(line: 3, column: 23, scope: !12)
73+
!28 = !DILocation(line: 3, column: 10, scope: !12)
74+
!29 = !DILocation(line: 4, column: 16, scope: !12)
75+
!30 = !DILocation(line: 3, column: 3, scope: !12)
76+
!31 = distinct !DISubprogram(name: "main", scope: !3, file: !3, line: 8, type: !32, scopeLine: 9, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !4)
77+
!32 = !DISubroutineType(types: !33)
78+
!33 = !{!6}
79+
!34 = !DILocation(line: 10, column: 10, scope: !31)
80+
!35 = !DILocation(line: 10, column: 3, scope: !31)

0 commit comments

Comments
 (0)