From fa78bc00e09506de50249ff090fcf2db64229c0c Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Sat, 7 Dec 2024 15:03:17 -0800 Subject: [PATCH] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20initia?= =?UTF-8?q?l=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Created using spr 1.3.6-beta.1 --- .../Instrumentation/SanitizerCoverage.cpp | 6 +-- .../cmp-tracing-api-x86_32.ll | 3 +- .../SanitizerCoverage/missing_dbg.ll | 49 ++++++++++++++----- 3 files changed, 42 insertions(+), 16 deletions(-) diff --git a/llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp b/llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp index 22acf59c78a38..2d6816f0ef5b8 100644 --- a/llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp +++ b/llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp @@ -1045,10 +1045,8 @@ void ModuleSanitizerCoverage::InjectCoverageAtBlock(Function &F, BasicBlock &BB, ->setCannotMerge(); // gets the PC using GET_CALLER_PC. } if (Options.TracePCGuard) { - auto GuardPtr = IRB.CreateIntToPtr( - IRB.CreateAdd(IRB.CreatePointerCast(FunctionGuardArray, IntptrTy), - ConstantInt::get(IntptrTy, Idx * 4)), - PtrTy); + auto GuardPtr = IRB.CreateConstInBoundsGEP1_64( + FunctionGuardArray->getValueType(), FunctionGuardArray, Idx); if (Options.GatedCallbacks) { Instruction *I = &*IP; auto GateBranch = CreateGateBranch(F, FunctionGateCmp, I); diff --git a/llvm/test/Instrumentation/SanitizerCoverage/cmp-tracing-api-x86_32.ll b/llvm/test/Instrumentation/SanitizerCoverage/cmp-tracing-api-x86_32.ll index 6ade3e32bd279..e57ff078a5274 100644 --- a/llvm/test/Instrumentation/SanitizerCoverage/cmp-tracing-api-x86_32.ll +++ b/llvm/test/Instrumentation/SanitizerCoverage/cmp-tracing-api-x86_32.ll @@ -7,13 +7,14 @@ target triple = "i386-unknown-linux-gnu" define i32 @foo() #0 { ; CHECK-LABEL: define i32 @foo() comdat { ; CHECK-NEXT: entry: -; CHECK-NEXT: call void @__sanitizer_cov_trace_pc_guard(ptr inttoptr (i32 ptrtoint (ptr @__sancov_gen_ to i32) to ptr)) #[[ATTR1:[0-9]+]] +; CHECK-NEXT: call void @__sanitizer_cov_trace_pc_guard(ptr @__sancov_gen_) #[[ATTR1:[0-9]+]] ; CHECK-NEXT: ret i32 0 ; entry: ret i32 0 } +; UTC_ARGS: --disable ; CHECK-DAG: declare void @__sanitizer_cov_trace_pc_indir(i32) ; CHECK-DAG: declare void @__sanitizer_cov_trace_cmp1(i8 zeroext, i8 zeroext) ; CHECK-DAG: declare void @__sanitizer_cov_trace_cmp2(i16 zeroext, i16 zeroext) diff --git a/llvm/test/Instrumentation/SanitizerCoverage/missing_dbg.ll b/llvm/test/Instrumentation/SanitizerCoverage/missing_dbg.ll index 21c6fcdb3a84b..360ef6891c337 100644 --- a/llvm/test/Instrumentation/SanitizerCoverage/missing_dbg.ll +++ b/llvm/test/Instrumentation/SanitizerCoverage/missing_dbg.ll @@ -1,8 +1,23 @@ +; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5 ; RUN: opt < %s -passes='module(sancov-module)' -sanitizer-coverage-level=2 -S | FileCheck %s target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128" define i32 @with_dbg(ptr %a, ptr %b) !dbg !3 { +; CHECK-LABEL: define i32 @with_dbg( +; CHECK-SAME: ptr [[A:%.*]], ptr [[B:%.*]]) comdat !dbg [[DBG3:![0-9]+]] { +; CHECK-NEXT: [[ENTRY:.*:]] +; CHECK-NEXT: call void @__sanitizer_cov_trace_pc_guard(ptr @__sancov_gen_) #[[ATTR1:[0-9]+]], !dbg [[DBG6:![0-9]+]] +; CHECK-NEXT: [[TMP1:%.*]] = load i32, ptr [[A]], align 4 +; CHECK-NEXT: [[CMP:%.*]] = icmp eq i32 [[TMP1]], 42 +; CHECK-NEXT: br i1 [[CMP]], label %[[BB0:.*]], label %[[BB1:.*]] +; CHECK: [[BB0]]: +; CHECK-NEXT: call void @__sanitizer_cov_trace_pc_guard(ptr getelementptr inbounds ([2 x i32], ptr @__sancov_gen_, i64 1)) #[[ATTR1]], !dbg [[DBG7:![0-9]+]] +; CHECK-NEXT: store i32 [[TMP1]], ptr [[B]], align 4 +; CHECK-NEXT: br label %[[BB1]] +; CHECK: [[BB1]]: +; CHECK-NEXT: ret i32 [[TMP1]] +; entry: %tmp1 = load i32, ptr %a, align 4 %cmp = icmp eq i32 %tmp1, 42 @@ -13,12 +28,22 @@ entry: 1: ret i32 %tmp1 } -; 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]+]] define i32 @without_dbg(ptr %a, ptr %b) { +; CHECK-LABEL: define i32 @without_dbg( +; CHECK-SAME: ptr [[A:%.*]], ptr [[B:%.*]]) comdat { +; CHECK-NEXT: [[ENTRY:.*:]] +; CHECK-NEXT: call void @__sanitizer_cov_trace_pc_guard(ptr @__sancov_gen_.1) #[[ATTR1]] +; CHECK-NEXT: [[TMP1:%.*]] = load i32, ptr [[A]], align 4 +; CHECK-NEXT: [[CMP:%.*]] = icmp eq i32 [[TMP1]], 42 +; CHECK-NEXT: br i1 [[CMP]], label %[[BB0:.*]], label %[[BB1:.*]] +; CHECK: [[BB0]]: +; CHECK-NEXT: call void @__sanitizer_cov_trace_pc_guard(ptr getelementptr inbounds ([2 x i32], ptr @__sancov_gen_.1, i64 1)) #[[ATTR1]] +; CHECK-NEXT: store i32 [[TMP1]], ptr [[B]], align 4 +; CHECK-NEXT: br label %[[BB1]] +; CHECK: [[BB1]]: +; CHECK-NEXT: ret i32 [[TMP1]] +; entry: %tmp1 = load i32, ptr %a, align 4 %cmp = icmp eq i32 %tmp1, 42 @@ -29,10 +54,6 @@ entry: 1: ret i32 %tmp1 } -; CHECK-LABEL: @without_dbg -; CHECK-NEXT: entry: -; CHECK: call void @__sanitizer_cov_trace_pc_guard(ptr @__sancov_gen_.1) #1 -; CHECK: call void @__sanitizer_cov_trace_pc_guard(ptr inttoptr (i64 add (i64 ptrtoint (ptr @__sancov_gen_.1 to i64), i64 4) to ptr)) #1 !llvm.dbg.cu = !{!0} !llvm.module.flags = !{!2} @@ -45,6 +66,12 @@ entry: !5 = !{} !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: [[META0:![0-9]+]] = distinct !DICompileUnit(language: DW_LANG_C89, file: [[META1:![0-9]+]], isOptimized: true, runtimeVersion: 0, emissionKind: LineTablesOnly, splitDebugInlining: false, nameTableKind: None) +; CHECK: [[META1]] = !DIFile(filename: "foo.c", directory: "") +; CHECK: [[DBG3]] = distinct !DISubprogram(name: "foo", scope: [[META1]], file: [[META1]], line: 190, type: [[META4:![0-9]+]], scopeLine: 192, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition | DISPFlagOptimized, unit: [[META0]]) +; CHECK: [[META4]] = !DISubroutineType(types: [[META5:![0-9]+]]) +; CHECK: [[META5]] = !{} +; CHECK: [[DBG6]] = !DILocation(line: 192, scope: [[DBG3]]) +; CHECK: [[DBG7]] = !DILocation(line: 0, scope: [[DBG3]]) +;.