<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Jun 5, 2014 at 7:34 AM, Evgeniy Stepanov <span dir="ltr"><<a href="mailto:eugeni.stepanov@gmail.com" target="_blank">eugeni.stepanov@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Author: eugenis<br>
Date: Thu Jun 5 09:34:45 2014<br>
New Revision: 210266<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=210266&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=210266&view=rev</a><br>
Log:<br>
[asancov] Fix coverage line info some more.<br>
<br>
Now it should always point to the opening brace of the function (in<br>
-asan-coverage=1 mode).<br></blockquote><div><br></div><div>This change makes debug info point to the opening brace of the function even in -asan-coverage=2 mode, </div><div>which is not what we want... </div><div> </div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<br>
Modified:<br>
llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp<br>
llvm/trunk/test/Instrumentation/AddressSanitizer/coverage-dbg.ll<br>
<br>
Modified: llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp?rev=210266&r1=210265&r2=210266&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp?rev=210266&r1=210265&r2=210266&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp Thu Jun 5 09:34:45 2014<br>
@@ -1254,7 +1254,9 @@ void AddressSanitizer::InjectCoverageAtB<br>
break;<br>
}<br>
<br>
+ DebugLoc EntryLoc = IP->getDebugLoc().getFnDebugLoc(*C);<br>
IRBuilder<> IRB(IP);<br>
+ IRB.SetCurrentDebugLocation(EntryLoc);<br>
Type *Int8Ty = IRB.getInt8Ty();<br>
GlobalVariable *Guard = new GlobalVariable(<br>
*F.getParent(), Int8Ty, false, GlobalValue::PrivateLinkage,<br>
@@ -1266,10 +1268,10 @@ void AddressSanitizer::InjectCoverageAtB<br>
Instruction *Ins = SplitBlockAndInsertIfThen(<br>
Cmp, IP, false, MDBuilder(*C).createBranchWeights(1, 100000));<br>
IRB.SetInsertPoint(Ins);<br>
+ IRB.SetCurrentDebugLocation(EntryLoc);<br>
// We pass &F to __sanitizer_cov. We could avoid this and rely on<br>
// GET_CALLER_PC, but having the PC of the first instruction is just nice.<br>
- Instruction *Call = IRB.CreateCall(AsanCovFunction);<br>
- Call->setDebugLoc(IP->getDebugLoc());<br>
+ IRB.CreateCall(AsanCovFunction);<br>
StoreInst *Store = IRB.CreateStore(ConstantInt::get(Int8Ty, 1), Guard);<br>
Store->setAtomic(Monotonic);<br>
Store->setAlignment(1);<br>
<br>
Modified: llvm/trunk/test/Instrumentation/AddressSanitizer/coverage-dbg.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Instrumentation/AddressSanitizer/coverage-dbg.ll?rev=210266&r1=210265&r2=210266&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Instrumentation/AddressSanitizer/coverage-dbg.ll?rev=210266&r1=210265&r2=210266&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Instrumentation/AddressSanitizer/coverage-dbg.ll (original)<br>
+++ llvm/trunk/test/Instrumentation/AddressSanitizer/coverage-dbg.ll Thu Jun 5 09:34:45 2014<br>
@@ -2,32 +2,66 @@<br>
<br>
; RUN: opt < %s -asan -asan-module -asan-coverage=1 -S | FileCheck %s<br>
<br>
+; C++ source:<br>
+; 1: struct A {<br>
+; 2: int f();<br>
+; 3: int x;<br>
+; 4: };<br>
+; 5:<br>
+; 6: int A::f() {<br>
+; 7: return x;<br>
+; 8: }<br>
+; clang++ ../1.cc -O3 -g -S -emit-llvm -fno-strict-aliasing<br>
+; and add sanitize_address to @_ZN1A1fEv<br>
+<br>
+; Test that __sanitizer_cov call has !dbg pointing to the opening { of A::f().<br>
+; CHECK: call void @__sanitizer_cov(), !dbg [[A:!.*]]<br>
+; CHECK: [[A]] = metadata !{i32 6, i32 0, metadata !{{.*}}, null}<br>
+<br>
+<br>
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"<br>
target triple = "x86_64-unknown-linux-gnu"<br>
<br>
-; Function Attrs: nounwind readnone uwtable<br>
-define void @_Z1fv() #0 {<br>
+%struct.A = type { i32 }<br>
+<br>
+; Function Attrs: nounwind readonly uwtable<br>
+define i32 @_ZN1A1fEv(%struct.A* nocapture readonly %this) #0 align 2 {<br>
entry:<br>
- ret void, !dbg !11<br>
+ tail call void @llvm.dbg.value(metadata !{%struct.A* %this}, i64 0, metadata !15), !dbg !20<br>
+ %x = getelementptr inbounds %struct.A* %this, i64 0, i32 0, !dbg !21<br>
+ %0 = load i32* %x, align 4, !dbg !21<br>
+ ret i32 %0, !dbg !21<br>
}<br>
<br>
-; CHECK: call void @__sanitizer_cov(), !dbg !<br>
+; Function Attrs: nounwind readnone<br>
+declare void @llvm.dbg.value(metadata, i64, metadata) #1<br>
<br>
-attributes #0 = { sanitize_address nounwind readnone uwtable "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }<br>
+attributes #0 = { sanitize_address nounwind readonly uwtable "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }<br>
+attributes #1 = { nounwind readnone }<br>
<br>
!<a href="http://llvm.dbg.cu" target="_blank">llvm.dbg.cu</a> = !{!0}<br>
-!llvm.module.flags = !{!8, !9}<br>
-!llvm.ident = !{!10}<br>
+!llvm.module.flags = !{!17, !18}<br>
+!llvm.ident = !{!19}<br>
<br>
-!0 = metadata !{i32 786449, metadata !1, i32 4, metadata !"clang version 3.5.0 (208682)", i1 true, metadata !"", i32 0, metadata !2, metadata !2, metadata !3, metadata !2, metadata !2, metadata !"", i32 1} ; [ DW_TAG_compile_unit ] [/tmp//tmp/1.cc] [DW_LANG_C_plus_plus]<br>
-!1 = metadata !{metadata !"/tmp/1.cc", metadata !"/tmp"}<br>
+!0 = metadata !{i32 786449, metadata !1, i32 4, metadata !"clang version 3.5.0 (210251)", i1 true, metadata !"", i32 0, metadata !2, metadata !3, metadata !12, metadata !2, metadata !2, metadata !"", i32 1} ; [ DW_TAG_compile_unit ] [/code/llvm/build0/../1.cc] [DW_LANG_C_plus_plus]<br>
+!1 = metadata !{metadata !"../1.cc", metadata !"/code/llvm/build0"}<br>
!2 = metadata !{}<br>
!3 = metadata !{metadata !4}<br>
-!4 = metadata !{i32 786478, metadata !1, metadata !5, metadata !"f", metadata !"f", metadata !"_Z1fv", i32 1, metadata !6, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 true, void ()* @_Z1fv, null, null, metadata !2, i32 1} ; [ DW_TAG_subprogram ] [line 1] [def] [f]<br>
-!5 = metadata !{i32 786473, metadata !1} ; [ DW_TAG_file_type ] [/tmp//tmp/1.cc]<br>
-!6 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !7, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
-!7 = metadata !{null}<br>
-!8 = metadata !{i32 2, metadata !"Dwarf Version", i32 4}<br>
-!9 = metadata !{i32 1, metadata !"Debug Info Version", i32 1}<br>
-!10 = metadata !{metadata !"clang version 3.5.0 (208682)"}<br>
-!11 = metadata !{i32 2, i32 0, metadata !4, null}<br>
+!4 = metadata !{i32 786451, metadata !1, null, metadata !"A", i32 1, i64 32, i64 32, i32 0, i32 0, null, metadata !5, i32 0, null, null, metadata !"_ZTS1A"} ; [ DW_TAG_structure_type ] [A] [line 1, size 32, align 32, offset 0] [def] [from ]<br>
+!5 = metadata !{metadata !6, metadata !8}<br>
+!6 = metadata !{i32 786445, metadata !1, metadata !"_ZTS1A", metadata !"x", i32 3, i64 32, i64 32, i64 0, i32 0, metadata !7} ; [ DW_TAG_member ] [x] [line 3, size 32, align 32, offset 0] [from int]<br>
+!7 = metadata !{i32 786468, null, null, metadata !"int", i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]<br>
+!8 = metadata !{i32 786478, metadata !1, metadata !"_ZTS1A", metadata !"f", metadata !"f", metadata !"_ZN1A1fEv", i32 2, metadata !9, i1 false, i1 false, i32 0, i32 0, null, i32 256, i1 true, null, null, i32 0, null, i32 2} ; [ DW_TAG_subprogram ] [line 2] [f]<br>
+!9 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !10, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
+!10 = metadata !{metadata !7, metadata !11}<br>
+!11 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64, i64 64, i64 0, i32 1088, metadata !"_ZTS1A"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [artificial] [from _ZTS1A]<br>
+!12 = metadata !{metadata !13}<br>
+!13 = metadata !{i32 786478, metadata !1, metadata !"_ZTS1A", metadata !"f", metadata !"f", metadata !"_ZN1A1fEv", i32 6, metadata !9, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 true, i32 (%struct.A*)* @_ZN1A1fEv, null, metadata !8, metadata !14, i32 6} ; [ DW_TAG_subprogram ] [line 6] [def] [f]<br>
+!14 = metadata !{metadata !15}<br>
+!15 = metadata !{i32 786689, metadata !13, metadata !"this", null, i32 16777216, metadata !16, i32 1088, i32 0} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
+!16 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64, i64 64, i64 0, i32 0, metadata !"_ZTS1A"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS1A]<br>
+!17 = metadata !{i32 2, metadata !"Dwarf Version", i32 4}<br>
+!18 = metadata !{i32 2, metadata !"Debug Info Version", i32 1}<br>
+!19 = metadata !{metadata !"clang version 3.5.0 (210251)"}<br>
+!20 = metadata !{i32 0, i32 0, metadata !13, null}<br>
+!21 = metadata !{i32 7, i32 0, metadata !13, null}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>