From f1a54a47b08df197b037aef97d04d87b5997f221 Mon Sep 17 00:00:00 2001 From: Justin Bogner Date: Tue, 29 Aug 2017 00:11:05 +0000 Subject: [PATCH] [sanitizer-coverage] Mark the guard and 8-bit counter arrays as used In r311742 we marked the PCs array as used so it wouldn't be dead stripped, but left the guard and 8-bit counters arrays alone since these are referenced by the coverage instrumentation. This doesn't quite work if we want the indices of the PCs array to match the other arrays though, since elements can still end up being dead and disappear. Instead, we mark all three of these arrays as used so that they'll be consistent with one another. llvm-svn: 311959 --- .../Instrumentation/SanitizerCoverage.cpp | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp b/llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp index ffe35f57db76..0f2e7772c76e 100644 --- a/llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp +++ b/llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp @@ -566,23 +566,30 @@ SanitizerCoverageModule::CreatePCArray(Function &F, ConstantArray::get(ArrayType::get(IntptrPtrTy, N * 2), PCs)); PCArray->setConstant(true); - // We don't reference the PCs array in any of our runtime functions, so we - // need to prevent it from being dead stripped. - appendToUsed(*F.getParent(), {PCArray}); - return PCArray; } void SanitizerCoverageModule::CreateFunctionLocalArrays( Function &F, ArrayRef AllBlocks) { - if (Options.TracePCGuard) + SmallVector LocalArrays; + if (Options.TracePCGuard) { FunctionGuardArray = CreateFunctionLocalArrayInSection( AllBlocks.size(), F, Int32Ty, SanCovGuardsSectionName); - if (Options.Inline8bitCounters) + LocalArrays.push_back(FunctionGuardArray); + } + if (Options.Inline8bitCounters) { Function8bitCounterArray = CreateFunctionLocalArrayInSection( AllBlocks.size(), F, Int8Ty, SanCovCountersSectionName); - if (Options.PCTable) + LocalArrays.push_back(Function8bitCounterArray); + } + if (Options.PCTable) { FunctionPCsArray = CreatePCArray(F, AllBlocks); + LocalArrays.push_back(FunctionPCsArray); + } + + // We don't reference these arrays directly in any of our runtime functions, + // so we need to prevent them from being dead stripped. + appendToUsed(*F.getParent(), LocalArrays); } bool SanitizerCoverageModule::InjectCoverage(Function &F,