Skip to content
This repository was archived by the owner on Feb 5, 2019. It is now read-only.

Commit e5920b3

Browse files
danielcdhdanielcdh
committed
Revert r251680:
Update the discriminator assignment algorithm * If a scope has already been assigned a discriminator, do not reassign a nested discriminator for it. * If the file and line both match, even if the column does not match, we should assign a new discriminator for the stmt. original code: ; #1 int foo(int i) { ; #2 if (i == 3 || i == 5) return 100; else return 99; ; #3 } ; i == 3: discriminator 0 ; i == 5: discriminator 2 ; return 100: discriminator 1 ; return 99: discriminator 3 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@251685 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent df3ef60 commit e5920b3

File tree

2 files changed

+11
-110
lines changed

2 files changed

+11
-110
lines changed

‎lib/Transforms/Utils/AddDiscriminators.cpp

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ bool AddDiscriminators::runOnFunction(Function &F) {
180180
BasicBlock *Succ = Last->getSuccessor(I);
181181
Instruction *First = Succ->getFirstNonPHIOrDbgOrLifetime();
182182
const DILocation *FirstDIL = First->getDebugLoc();
183-
if (!FirstDIL || FirstDIL->getDiscriminator())
183+
if (!FirstDIL)
184184
continue;
185185

186186
// If the first instruction (First) of Succ is at the same file
@@ -202,22 +202,21 @@ bool AddDiscriminators::runOnFunction(Function &F) {
202202
unsigned Discriminator = FirstDIL->computeNewDiscriminator();
203203
auto *NewScope =
204204
Builder.createLexicalBlockFile(Scope, File, Discriminator);
205+
auto *NewDIL =
206+
DILocation::get(Ctx, FirstDIL->getLine(), FirstDIL->getColumn(),
207+
NewScope, FirstDIL->getInlinedAt());
208+
DebugLoc newDebugLoc = NewDIL;
205209

206210
// Attach this new debug location to First and every
207211
// instruction following First that shares the same location.
208212
for (BasicBlock::iterator I1(*First), E1 = Succ->end(); I1 != E1;
209213
++I1) {
210-
const DILocation *CurrentDIL = I1->getDebugLoc();
211-
if (CurrentDIL && CurrentDIL->getLine() == FirstDIL->getLine() &&
212-
CurrentDIL->getFilename() == FirstDIL->getFilename()) {
213-
I1->setDebugLoc(DILocation::get(Ctx, CurrentDIL->getLine(),
214-
CurrentDIL->getColumn(), NewScope,
215-
CurrentDIL->getInlinedAt()));
216-
DEBUG(dbgs() << CurrentDIL->getFilename() << ":"
217-
<< CurrentDIL->getLine() << ":"
218-
<< CurrentDIL->getColumn() << ":"
219-
<< CurrentDIL->getDiscriminator() << *I1 << "\n");
220-
}
214+
if (I1->getDebugLoc().get() != FirstDIL)
215+
break;
216+
I1->setDebugLoc(newDebugLoc);
217+
DEBUG(dbgs() << NewDIL->getFilename() << ":" << NewDIL->getLine()
218+
<< ":" << NewDIL->getColumn() << ":"
219+
<< NewDIL->getDiscriminator() << *I1 << "\n");
221220
}
222221
DEBUG(dbgs() << "\n");
223222
Changed = true;

‎test/Transforms/AddDiscriminators/oneline.ll

Lines changed: 0 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +0,0 @@
1-
; RUN: opt < %s -add-discriminators -S | FileCheck %s
2-
3-
; Discriminator support for code that is written in one line:
4-
; #1 int foo(int i) {
5-
; #2 if (i == 3 || i == 5) return 100; else return 99;
6-
; #3 }
7-
8-
; i == 3: discriminator 0
9-
; i == 5: discriminator 2
10-
; return 100: discriminator 1
11-
; return 99: discriminator 3
12-
13-
define i32 @_Z3fooi(i32 %i) #0 {
14-
%1 = alloca i32, align 4
15-
%2 = alloca i32, align 4
16-
store i32 %i, i32* %2, align 4, !tbaa !13
17-
call void @llvm.dbg.declare(metadata i32* %2, metadata !9, metadata !17), !dbg !18
18-
%3 = load i32, i32* %2, align 4, !dbg !19, !tbaa !13
19-
%4 = icmp eq i32 %3, 3, !dbg !21
20-
br i1 %4, label %8, label %5, !dbg !22
21-
22-
; <label>:5 ; preds = %0
23-
%6 = load i32, i32* %2, align 4, !dbg !23, !tbaa !13
24-
; CHECK: %6 = load i32, i32* %2, align 4, !dbg ![[THEN1:[0-9]+]],{{.*}}
25-
26-
%7 = icmp eq i32 %6, 5, !dbg !24
27-
; CHECK: %7 = icmp eq i32 %6, 5, !dbg ![[THEN2:[0-9]+]]
28-
29-
br i1 %7, label %8, label %9, !dbg !25
30-
; CHECK: br i1 %7, label %8, label %9, !dbg ![[THEN3:[0-9]+]]
31-
32-
; <label>:8 ; preds = %5, %0
33-
store i32 100, i32* %1, align 4, !dbg !26
34-
; CHECK: store i32 100, i32* %1, align 4, !dbg ![[ELSE:[0-9]+]]
35-
36-
br label %10, !dbg !26
37-
; CHECK: br label %10, !dbg ![[ELSE]]
38-
39-
; <label>:9 ; preds = %5
40-
store i32 99, i32* %1, align 4, !dbg !27
41-
; CHECK: store i32 99, i32* %1, align 4, !dbg ![[COMBINE:[0-9]+]]
42-
43-
br label %10, !dbg !27
44-
; CHECK: br label %10, !dbg ![[COMBINE]]
45-
46-
; <label>:10 ; preds = %9, %8
47-
%11 = load i32, i32* %1, align 4, !dbg !28
48-
ret i32 %11, !dbg !28
49-
}
50-
51-
; Function Attrs: nounwind readnone
52-
declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
53-
54-
attributes #0 = { nounwind uwtable "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2" "unsafe-fp-math"="false" "use-soft-float"="false" }
55-
attributes #1 = { nounwind readnone }
56-
57-
!llvm.dbg.cu = !{!0}
58-
!llvm.module.flags = !{!10, !11}
59-
!llvm.ident = !{!12}
60-
61-
!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !1, producer: "clang version 3.8.0 (trunk 250915)", isOptimized: true, runtimeVersion: 0, emissionKind: 1, enums: !2, subprograms: !3)
62-
!1 = !DIFile(filename: "a.cc", directory: "/usr/local/google/home/dehao/discr")
63-
!2 = !{}
64-
!3 = !{!4}
65-
!4 = distinct !DISubprogram(name: "foo", linkageName: "_Z3fooi", scope: !1, file: !1, line: 1, type: !5, isLocal: false, isDefinition: true, scopeLine: 1, flags: DIFlagPrototyped, isOptimized: true, function: i32 (i32)* @_Z3fooi, variables: !8)
66-
!5 = !DISubroutineType(types: !6)
67-
!6 = !{!7, !7}
68-
!7 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed)
69-
!8 = !{!9}
70-
!9 = !DILocalVariable(name: "i", arg: 1, scope: !4, file: !1, line: 1, type: !7)
71-
!10 = !{i32 2, !"Dwarf Version", i32 4}
72-
!11 = !{i32 2, !"Debug Info Version", i32 3}
73-
!12 = !{!"clang version 3.8.0 (trunk 250915)"}
74-
!13 = !{!14, !14, i64 0}
75-
!14 = !{!"int", !15, i64 0}
76-
!15 = !{!"omnipotent char", !16, i64 0}
77-
!16 = !{!"Simple C/C++ TBAA"}
78-
!17 = !DIExpression()
79-
!18 = !DILocation(line: 1, column: 13, scope: !4)
80-
!19 = !DILocation(line: 2, column: 7, scope: !20)
81-
!20 = distinct !DILexicalBlock(scope: !4, file: !1, line: 2, column: 7)
82-
!21 = !DILocation(line: 2, column: 9, scope: !20)
83-
!22 = !DILocation(line: 2, column: 14, scope: !20)
84-
!23 = !DILocation(line: 2, column: 17, scope: !20)
85-
!24 = !DILocation(line: 2, column: 19, scope: !20)
86-
!25 = !DILocation(line: 2, column: 7, scope: !4)
87-
!26 = !DILocation(line: 2, column: 25, scope: !20)
88-
!27 = !DILocation(line: 2, column: 42, scope: !20)
89-
!28 = !DILocation(line: 3, column: 1, scope: !4)
90-
91-
; CHECK: ![[THEN1]] = !DILocation(line: 2, column: 17, scope: ![[THENBLOCK:[0-9]+]])
92-
; CHECK: ![[THENBLOCK]] = !DILexicalBlockFile({{.*}} discriminator: 2)
93-
; CHECK: ![[THEN2]] = !DILocation(line: 2, column: 19, scope: ![[THENBLOCK]])
94-
; CHECK: ![[THEN3]] = !DILocation(line: 2, column: 7, scope: ![[THENBLOCK]])
95-
; CHECK: ![[ELSE]] = !DILocation(line: 2, column: 25, scope: ![[ELSEBLOCK:[0-9]+]])
96-
; CHECK: ![[ELSEBLOCK]] = !DILexicalBlockFile({{.*}} discriminator: 1)
97-
; CHECK: ![[COMBINE]] = !DILocation(line: 2, column: 42, scope: ![[COMBINEBLOCK:[0-9]+]])
98-
; CHECK: ![[COMBINEBLOCK]] = !DILexicalBlockFile({{.*}} discriminator: 3)

0 commit comments

Comments
 (0)