From 2ee1cc737e35c964f330938a04c4e75968ee0b97 Mon Sep 17 00:00:00 2001 From: Derek Bruening Date: Fri, 3 Jun 2016 19:40:37 +0000 Subject: [PATCH] [esan] Specify which tool via a global variable Summary: Adds a global variable to specify the tool, to support handling early interceptors that invoke instrumented code and require shadow memory to be initialized prior to __esan_init() being invoked. Reviewers: aizatsky Subscribers: vitalybuka, zhaoqin, kcc, eugenis, llvm-commits Differential Revision: http://reviews.llvm.org/D20973 llvm-svn: 271715 --- .../Instrumentation/EfficiencySanitizer.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lib/Transforms/Instrumentation/EfficiencySanitizer.cpp b/lib/Transforms/Instrumentation/EfficiencySanitizer.cpp index d29d400e72e..da3e0ca9efd 100644 --- a/lib/Transforms/Instrumentation/EfficiencySanitizer.cpp +++ b/lib/Transforms/Instrumentation/EfficiencySanitizer.cpp @@ -72,6 +72,10 @@ static const char *const EsanModuleDtorName = "esan.module_dtor"; static const char *const EsanInitName = "__esan_init"; static const char *const EsanExitName = "__esan_exit"; +// We need to specify the tool to the runtime earlier than +// the ctor is called in some cases, so we set a global variable. +static const char *const EsanWhichToolName = "__esan_which_tool"; + // We must keep these Shadow* constants consistent with the esan runtime. // FIXME: Try to place these shadow constants, the names of the __esan_* // interface functions, and the ToolType enum into a header shared between @@ -430,6 +434,8 @@ bool EfficiencySanitizer::initOnModule(Module &M) { // Create the variable passed to EsanInit and EsanExit. Constant *ToolInfoArg = createEsanInitToolInfoArg(M); // Constructor + // We specify the tool type both in the EsanWhichToolName global + // and as an arg to the init routine as a sanity check. std::tie(EsanCtorFunction, std::ignore) = createSanitizerCtorAndInitFunctions( M, EsanModuleCtorName, EsanInitName, /*InitArgTypes=*/{OrdTy, Int8PtrTy}, /*InitArgs=*/{ @@ -438,6 +444,13 @@ bool EfficiencySanitizer::initOnModule(Module &M) { appendToGlobalCtors(M, EsanCtorFunction, EsanCtorAndDtorPriority); createDestructor(M, ToolInfoArg); + + new GlobalVariable(M, OrdTy, true, + GlobalValue::WeakAnyLinkage, + ConstantInt::get(OrdTy, + static_cast(Options.ToolType)), + EsanWhichToolName); + return true; }