[llvm] r282097 - revert 281908 because 281909 got reverted
Nico Weber via llvm-commits
llvm-commits at lists.llvm.org
Wed Sep 21 11:25:43 PDT 2016
Author: nico
Date: Wed Sep 21 13:25:43 2016
New Revision: 282097
URL: http://llvm.org/viewvc/llvm-project?rev=282097&view=rev
Log:
revert 281908 because 281909 got reverted
Removed:
llvm/trunk/test/Instrumentation/AddressSanitizer/basic-msvc64.ll
Modified:
llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp
Modified: llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp?rev=282097&r1=282096&r2=282097&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp (original)
+++ llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp Wed Sep 21 13:25:43 2016
@@ -67,7 +67,6 @@ using namespace llvm;
static const uint64_t kDefaultShadowScale = 3;
static const uint64_t kDefaultShadowOffset32 = 1ULL << 29;
static const uint64_t kDefaultShadowOffset64 = 1ULL << 44;
-static const uint64_t kDynamicShadowSentinel = ~(uint64_t)0;
static const uint64_t kIOSShadowOffset32 = 1ULL << 30;
static const uint64_t kIOSShadowOffset64 = 0x120200000;
static const uint64_t kIOSSimShadowOffset32 = 1ULL << 30;
@@ -82,8 +81,8 @@ static const uint64_t kAArch64_ShadowOff
static const uint64_t kFreeBSD_ShadowOffset32 = 1ULL << 30;
static const uint64_t kFreeBSD_ShadowOffset64 = 1ULL << 46;
static const uint64_t kWindowsShadowOffset32 = 3ULL << 28;
-// The shadow memory space is dynamically allocated.
-static const uint64_t kWindowsShadowOffset64 = kDynamicShadowSentinel;
+// TODO(wwchrome): Experimental for asan Win64, may change.
+static const uint64_t kWindowsShadowOffset64 = 0x1ULL << 45; // 32TB.
static const size_t kMinStackMallocSize = 1 << 6; // 64B
static const size_t kMaxStackMallocSize = 1 << 16; // 64K
@@ -126,9 +125,6 @@ static const char *const kAsanGlobalsReg
static const char *const kAsanOptionDetectUseAfterReturn =
"__asan_option_detect_stack_use_after_return";
-static const char *const kAsanShadowMemoryDynamicAddress =
- "__asan_shadow_memory_dynamic_address";
-
static const char *const kAsanAllocaPoison = "__asan_alloca_poison";
static const char *const kAsanAllocasUnpoison = "__asan_allocas_unpoison";
@@ -161,11 +157,6 @@ static cl::opt<bool> ClAlwaysSlowPath(
"asan-always-slow-path",
cl::desc("use instrumentation with slow path for all accesses"), cl::Hidden,
cl::init(false));
-static cl::opt<bool> ClForceDynamicShadow(
- "asan-force-dynamic-shadow",
- cl::desc("Load shadow address into a local variable for each function"),
- cl::Hidden, cl::init(false));
-
// This flag limits the number of instructions to be instrumented
// in any given BB. Normally, this should be set to unlimited (INT_MAX),
// but due to http://llvm.org/bugs/show_bug.cgi?id=12652 we temporary
@@ -456,8 +447,7 @@ static ShadowMapping getShadowMapping(Tr
// we could OR the constant in a single instruction, but it's more
// efficient to load it once and use indexed addressing.
Mapping.OrShadowOffset = !IsAArch64 && !IsPPC64 && !IsSystemZ
- && !(Mapping.Offset & (Mapping.Offset - 1))
- && Mapping.Offset != kDynamicShadowSentinel;
+ && !(Mapping.Offset & (Mapping.Offset - 1));
return Mapping;
}
@@ -474,8 +464,7 @@ struct AddressSanitizer : public Functio
bool UseAfterScope = false)
: FunctionPass(ID), CompileKernel(CompileKernel || ClEnableKasan),
Recover(Recover || ClRecover),
- UseAfterScope(UseAfterScope || ClUseAfterScope),
- LocalDynamicShadow(nullptr) {
+ UseAfterScope(UseAfterScope || ClUseAfterScope) {
initializeAddressSanitizerPass(*PassRegistry::getPassRegistry());
}
const char *getPassName() const override {
@@ -523,7 +512,6 @@ struct AddressSanitizer : public Functio
Value *memToShadow(Value *Shadow, IRBuilder<> &IRB);
bool runOnFunction(Function &F) override;
bool maybeInsertAsanInitAtFunctionEntry(Function &F);
- void maybeInsertDynamicShadowAtFunctionEntry(Function &F);
void markEscapedLocalAllocas(Function &F);
bool doInitialization(Module &M) override;
bool doFinalization(Module &M) override;
@@ -545,12 +533,8 @@ struct AddressSanitizer : public Functio
FunctionStateRAII(AddressSanitizer *Pass) : Pass(Pass) {
assert(Pass->ProcessedAllocas.empty() &&
"last pass forgot to clear cache");
- assert(!Pass->LocalDynamicShadow);
- }
- ~FunctionStateRAII() {
- Pass->LocalDynamicShadow = nullptr;
- Pass->ProcessedAllocas.clear();
}
+ ~FunctionStateRAII() { Pass->ProcessedAllocas.clear(); }
};
LLVMContext *C;
@@ -574,7 +558,6 @@ struct AddressSanitizer : public Functio
Function *AsanMemoryAccessCallbackSized[2][2];
Function *AsanMemmove, *AsanMemcpy, *AsanMemset;
InlineAsm *EmptyAsm;
- Value *LocalDynamicShadow;
GlobalsMetadata GlobalsMD;
DenseMap<const AllocaInst *, bool> ProcessedAllocas;
@@ -938,15 +921,10 @@ Value *AddressSanitizer::memToShadow(Val
Shadow = IRB.CreateLShr(Shadow, Mapping.Scale);
if (Mapping.Offset == 0) return Shadow;
// (Shadow >> scale) | offset
- Value *ShadowBase;
- if (LocalDynamicShadow)
- ShadowBase = LocalDynamicShadow;
- else
- ShadowBase = ConstantInt::get(IntptrTy, Mapping.Offset);
if (Mapping.OrShadowOffset)
- return IRB.CreateOr(Shadow, ShadowBase);
+ return IRB.CreateOr(Shadow, ConstantInt::get(IntptrTy, Mapping.Offset));
else
- return IRB.CreateAdd(Shadow, ShadowBase);
+ return IRB.CreateAdd(Shadow, ConstantInt::get(IntptrTy, Mapping.Offset));
}
// Instrument memset/memmove/memcpy
@@ -999,10 +977,6 @@ Value *AddressSanitizer::isInterestingMe
// Skip memory accesses inserted by another instrumentation.
if (I->getMetadata("nosanitize")) return nullptr;
- // Do not instrument the load fetching the dynamic shadow address.
- if (LocalDynamicShadow == I)
- return nullptr;
-
Value *PtrOperand = nullptr;
const DataLayout &DL = I->getModule()->getDataLayout();
if (LoadInst *LI = dyn_cast<LoadInst>(I)) {
@@ -1807,17 +1781,6 @@ bool AddressSanitizer::maybeInsertAsanIn
return false;
}
-void AddressSanitizer::maybeInsertDynamicShadowAtFunctionEntry(Function &F) {
- // Generate code only when dynamic addressing is needed.
- if (!ClForceDynamicShadow && Mapping.Offset != kDynamicShadowSentinel)
- return;
-
- IRBuilder<> IRB(&F.front().front());
- Value *GlobalDynamicAddress = F.getParent()->getOrInsertGlobal(
- kAsanShadowMemoryDynamicAddress, IntptrTy);
- LocalDynamicShadow = IRB.CreateLoad(GlobalDynamicAddress);
-}
-
void AddressSanitizer::markEscapedLocalAllocas(Function &F) {
// Find the one possible call to llvm.localescape and pre-mark allocas passed
// to it as uninteresting. This assumes we haven't started processing allocas
@@ -1870,8 +1833,6 @@ bool AddressSanitizer::runOnFunction(Fun
FunctionStateRAII CleanupObj(this);
- maybeInsertDynamicShadowAtFunctionEntry(F);
-
// We can't instrument allocas used with llvm.localescape. Only static allocas
// can be passed to that intrinsic.
markEscapedLocalAllocas(F);
Removed: llvm/trunk/test/Instrumentation/AddressSanitizer/basic-msvc64.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Instrumentation/AddressSanitizer/basic-msvc64.ll?rev=282096&view=auto
==============================================================================
--- llvm/trunk/test/Instrumentation/AddressSanitizer/basic-msvc64.ll (original)
+++ llvm/trunk/test/Instrumentation/AddressSanitizer/basic-msvc64.ll (removed)
@@ -1,35 +0,0 @@
-; Test basic address sanitizer instrumentation.
-;
-; RUN: opt -asan -asan-module -S < %s | FileCheck %s
-
-target triple = "x86_64-pc-windows-msvc"
-; CHECK: @llvm.global_ctors = {{.*}}@asan.module_ctor
-
-define i32 @test_load(i32* %a) sanitize_address {
-; First instrumentation in the function must be to load the dynamic shadow
-; address into a local variable.
-; CHECK-LABEL: @test_load
-; CHECK: entry:
-; CHECK-NEXT: %[[SHADOW:[^ ]*]] = load i64, i64* @__asan_shadow_memory_dynamic_address
-
-; Shadow address is loaded and added into the whole offset computation.
-; CHECK add i64 %{{.*}}, %[[SHADOW] ]
-
-entry:
- %tmp1 = load i32, i32* %a, align 4
- ret i32 %tmp1
-}
-
-define i32 @__asan_options(i32* %a) sanitize_address {
-; Asan functions are not instrumented. Asan function may be called by
-; __asan_init before the shadow initialisation, which may lead to incorrect
-; behavior of the instrumented code.
-; CHECK-LABEL: @__asan_options
-; CHECK: entry:
-; CHECK-NEXT: %tmp1 = load i32, i32* %a, align 4
-; CHECK-NEXT: ret i32 %tmp1
-
-entry:
- %tmp1 = load i32, i32* %a, align 4
- ret i32 %tmp1
-}
More information about the llvm-commits
mailing list