[llvm] r210266 - [asancov] Fix coverage line info some more.
Kostya Serebryany
kcc at google.com
Tue Sep 2 18:23:40 PDT 2014
On Thu, Jun 5, 2014 at 7:34 AM, Evgeniy Stepanov <eugeni.stepanov at gmail.com>
wrote:
> Author: eugenis
> Date: Thu Jun 5 09:34:45 2014
> New Revision: 210266
>
> URL: http://llvm.org/viewvc/llvm-project?rev=210266&view=rev
> Log:
> [asancov] Fix coverage line info some more.
>
> Now it should always point to the opening brace of the function (in
> -asan-coverage=1 mode).
>
This change makes debug info point to the opening brace of the function
even in -asan-coverage=2 mode,
which is not what we want...
>
> Modified:
> llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp
> llvm/trunk/test/Instrumentation/AddressSanitizer/coverage-dbg.ll
>
> Modified: llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp?rev=210266&r1=210265&r2=210266&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp
> (original)
> +++ llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp Thu
> Jun 5 09:34:45 2014
> @@ -1254,7 +1254,9 @@ void AddressSanitizer::InjectCoverageAtB
> break;
> }
>
> + DebugLoc EntryLoc = IP->getDebugLoc().getFnDebugLoc(*C);
> IRBuilder<> IRB(IP);
> + IRB.SetCurrentDebugLocation(EntryLoc);
> Type *Int8Ty = IRB.getInt8Ty();
> GlobalVariable *Guard = new GlobalVariable(
> *F.getParent(), Int8Ty, false, GlobalValue::PrivateLinkage,
> @@ -1266,10 +1268,10 @@ void AddressSanitizer::InjectCoverageAtB
> Instruction *Ins = SplitBlockAndInsertIfThen(
> Cmp, IP, false, MDBuilder(*C).createBranchWeights(1, 100000));
> IRB.SetInsertPoint(Ins);
> + IRB.SetCurrentDebugLocation(EntryLoc);
> // We pass &F to __sanitizer_cov. We could avoid this and rely on
> // GET_CALLER_PC, but having the PC of the first instruction is just
> nice.
> - Instruction *Call = IRB.CreateCall(AsanCovFunction);
> - Call->setDebugLoc(IP->getDebugLoc());
> + IRB.CreateCall(AsanCovFunction);
> StoreInst *Store = IRB.CreateStore(ConstantInt::get(Int8Ty, 1), Guard);
> Store->setAtomic(Monotonic);
> Store->setAlignment(1);
>
> Modified: llvm/trunk/test/Instrumentation/AddressSanitizer/coverage-dbg.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Instrumentation/AddressSanitizer/coverage-dbg.ll?rev=210266&r1=210265&r2=210266&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/Instrumentation/AddressSanitizer/coverage-dbg.ll
> (original)
> +++ llvm/trunk/test/Instrumentation/AddressSanitizer/coverage-dbg.ll Thu
> Jun 5 09:34:45 2014
> @@ -2,32 +2,66 @@
>
> ; RUN: opt < %s -asan -asan-module -asan-coverage=1 -S | FileCheck %s
>
> +; C++ source:
> +; 1: struct A {
> +; 2: int f();
> +; 3: int x;
> +; 4: };
> +; 5:
> +; 6: int A::f() {
> +; 7: return x;
> +; 8: }
> +; clang++ ../1.cc -O3 -g -S -emit-llvm -fno-strict-aliasing
> +; and add sanitize_address to @_ZN1A1fEv
> +
> +; Test that __sanitizer_cov call has !dbg pointing to the opening { of
> A::f().
> +; CHECK: call void @__sanitizer_cov(), !dbg [[A:!.*]]
> +; CHECK: [[A]] = metadata !{i32 6, i32 0, metadata !{{.*}}, null}
> +
> +
> target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
> target triple = "x86_64-unknown-linux-gnu"
>
> -; Function Attrs: nounwind readnone uwtable
> -define void @_Z1fv() #0 {
> +%struct.A = type { i32 }
> +
> +; Function Attrs: nounwind readonly uwtable
> +define i32 @_ZN1A1fEv(%struct.A* nocapture readonly %this) #0 align 2 {
> entry:
> - ret void, !dbg !11
> + tail call void @llvm.dbg.value(metadata !{%struct.A* %this}, i64 0,
> metadata !15), !dbg !20
> + %x = getelementptr inbounds %struct.A* %this, i64 0, i32 0, !dbg !21
> + %0 = load i32* %x, align 4, !dbg !21
> + ret i32 %0, !dbg !21
> }
>
> -; CHECK: call void @__sanitizer_cov(), !dbg !
> +; Function Attrs: nounwind readnone
> +declare void @llvm.dbg.value(metadata, i64, metadata) #1
>
> -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" }
> +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" }
> +attributes #1 = { nounwind readnone }
>
> !llvm.dbg.cu = !{!0}
> -!llvm.module.flags = !{!8, !9}
> -!llvm.ident = !{!10}
> +!llvm.module.flags = !{!17, !18}
> +!llvm.ident = !{!19}
>
> -!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]
> -!1 = metadata !{metadata !"/tmp/1.cc", metadata !"/tmp"}
> +!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]
> +!1 = metadata !{metadata !"../1.cc", metadata !"/code/llvm/build0"}
> !2 = metadata !{}
> !3 = metadata !{metadata !4}
> -!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]
> -!5 = metadata !{i32 786473, metadata !1} ; [ DW_TAG_file_type ]
> [/tmp//tmp/1.cc]
> -!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 ]
> -!7 = metadata !{null}
> -!8 = metadata !{i32 2, metadata !"Dwarf Version", i32 4}
> -!9 = metadata !{i32 1, metadata !"Debug Info Version", i32 1}
> -!10 = metadata !{metadata !"clang version 3.5.0 (208682)"}
> -!11 = metadata !{i32 2, i32 0, metadata !4, null}
> +!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 ]
> +!5 = metadata !{metadata !6, metadata !8}
> +!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]
> +!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]
> +!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]
> +!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 ]
> +!10 = metadata !{metadata !7, metadata !11}
> +!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]
> +!12 = metadata !{metadata !13}
> +!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]
> +!14 = metadata !{metadata !15}
> +!15 = metadata !{i32 786689, metadata !13, metadata !"this", null, i32
> 16777216, metadata !16, i32 1088, i32 0} ; [ DW_TAG_arg_variable ] [this]
> [line 0]
> +!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]
> +!17 = metadata !{i32 2, metadata !"Dwarf Version", i32 4}
> +!18 = metadata !{i32 2, metadata !"Debug Info Version", i32 1}
> +!19 = metadata !{metadata !"clang version 3.5.0 (210251)"}
> +!20 = metadata !{i32 0, i32 0, metadata !13, null}
> +!21 = metadata !{i32 7, i32 0, metadata !13, null}
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20140902/a11bebae/attachment.html>
More information about the llvm-commits
mailing list