Skip to content

[Instrumentation] Mark instrumented calls as implicit #106447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+13 −12
Open

[Instrumentation] Mark instrumented calls as implicit #106447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de017e6
[Instrumentation] Do not attache line number to instrumented call deb…
serge-sans-paille Sep 4, 2024
bdfb990
fixup! [Instrumentation] Do not attache line number to instrumented c…
serge-sans-paille Sep 5, 2024
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
3 changes: 2 additions & 1 deletion llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,8 @@ void ModuleSanitizerCoverage::InjectCoverageAtBlock(Function &F, BasicBlock &BB,
DebugLoc EntryLoc;
if (IsEntryBB) {
if (auto SP = F.getSubprogram())
EntryLoc = DILocation::get(SP->getContext(), SP->getScopeLine(), 0, SP);
// Use a compile-generated source-location for all coverage calls.
EntryLoc = DILocation::get(SP->getContext(), 0, 0, SP);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMHO this warrants a comment along the lines of "Use a compile-generated source-location for all coverage calls", to aid future readers

// Keep static allocas and llvm.localescape calls in the entry block. Even
// if we aren't splitting the block, it's nice for allocas to be before
// calls.
Expand Down
6 changes: 4 additions & 2 deletions llvm/test/Instrumentation/SanitizerCoverage/coverage-dbg.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
; clang++ ../1.cc -O3 -g -S -emit-llvm -fno-strict-aliasing
; and add sanitize_address to @_ZN1A1fEv

; Test that __sanitizer_cov_trace_pc_guard call has !dbg pointing to the opening { of A::f().
; Test that __sanitizer_cov_trace_pc_guard call has !dbg pointing at a
; compiler-generated instruction.

; CHECK: call void @__sanitizer_cov_trace_pc_guard(ptr{{.*}}) #{{.*}}, !dbg [[A:!.*]]
; CHECK: [[A]] = !DILocation(line: 6, scope: !{{.*}})
; CHECK: [[A]] = !DILocation(line: 1, scope: !{{.*}})


target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
Expand Down
2 changes: 1 addition & 1 deletion llvm/test/Instrumentation/SanitizerCoverage/coverage2-dbg.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ target triple = "x86_64-unknown-linux-gnu"
; CHECK: call void @__sanitizer_cov{{.*}}(ptr{{.*}}) #{{.*}}, !dbg [[A:!.*]]
; CHECK: call void @__sanitizer_cov{{.*}}(ptr{{.*}}) #{{.*}}, !dbg [[B:!.*]]
; CHECK: ret void
; CHECK: [[A]] = !DILocation(line: 1, scope: !{{.*}})
; CHECK: [[A]] = !DILocation(line: 0, scope: !{{.*}})
; CHECK: [[B]] = !DILocation(line: 3, column: 5, scope: !{{.*}})

define void @_Z3fooPi(ptr %a) #0 !dbg !4 {
Expand Down
9 changes: 4 additions & 5 deletions llvm/test/Instrumentation/SanitizerCoverage/crit-edge-sancov.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@ define void @update_shadow(i1 %c) !dbg !3 {
; CHECK-NEXT: entry:
; CHECK-NEXT: call void @__sanitizer_cov_trace_pc() #[[ATTR0:[0-9]+]], !dbg [[DBG6:![0-9]+]]
; CHECK: entry.for.inc.i_crit_edge:
; CHECK-NEXT: call void @__sanitizer_cov_trace_pc() #[[ATTR0]], !dbg [[DBG7:![0-9]+]]
; CHECK-NEXT: call void @__sanitizer_cov_trace_pc() #[[ATTR0]], !dbg [[DBG6]]
; CHECK: if.end22.i:
; CHECK-NEXT: call void @__sanitizer_cov_trace_pc() #[[ATTR0]], !dbg [[DBG8:![0-9]+]]
; CHECK: [[DBG6]] = !DILocation(line: 192, scope: !3)
; CHECK: [[DBG7]] = !DILocation(line: 0, scope: !3)
; CHECK: [[DBG8]] = !DILocation(line: 129, column: 2, scope: !3)
; CHECK-NEXT: call void @__sanitizer_cov_trace_pc() #[[ATTR0]], !dbg [[DBG7:![0-9]+]]
; CHECK: [[DBG6]] = !DILocation(line: 0, scope: !3)
; CHECK: [[DBG7]] = !DILocation(line: 129, column: 2, scope: !3)
entry:
br i1 %c, label %for.inc.i, label %if.end22.i

Expand Down
5 changes: 2 additions & 3 deletions llvm/test/Instrumentation/SanitizerCoverage/missing_dbg.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ entry:
; CHECK-LABEL: @with_dbg
; CHECK-NEXT: entry:
; CHECK: call void @__sanitizer_cov_trace_pc_guard(ptr @__sancov_gen_) #1, !dbg [[DBG1:![0-9]+]]
; CHECK: call void @__sanitizer_cov_trace_pc_guard(ptr inttoptr (i64 add (i64 ptrtoint (ptr @__sancov_gen_ to i64), i64 4) to ptr)) #1, !dbg [[DBG2:![0-9]+]]
; CHECK: call void @__sanitizer_cov_trace_pc_guard(ptr inttoptr (i64 add (i64 ptrtoint (ptr @__sancov_gen_ to i64), i64 4) to ptr)) #1, !dbg [[DBG1]]

define i32 @without_dbg(ptr %a, ptr %b) {
entry:
Expand Down Expand Up @@ -46,5 +46,4 @@ entry:
!6 = !DILocation(line: 192, scope: !3)
!7 = !DILocation(line: 0, scope: !3)

; CHECK: [[DBG1]] = !DILocation(line: 192, scope: !3)
; CHECK: [[DBG2]] = !DILocation(line: 0, scope: !3)
; CHECK: [[DBG1]] = !DILocation(line: 0, scope: !3)
Loading