This is an archive of the discontinued LLVM Phabricator instance.

Differential D20761

[asan] Rename kAsanOptionDetectUAR into kAsanOptionDetectUseAfterReturn
ClosedPublic

Authored by vitalybuka on May 27 2016, 5:10 PM.

Details

Reviewers
kcc
eugenis
aizatsky
Commits
rG7b8ed4f22366: [asan] Rename *UAR* into *UseAfterReturn*
rL271447: [asan] Rename *UAR* into *UseAfterReturn*
Summary

PR27453

Diff Detail

Event Timeline

vitalybuka updated this revision to Diff 58867.May 27 2016, 5:10 PM
vitalybuka retitled this revision from to [asan] Rename kAsanOptionDetectUAR into kAsanOptionDetectUseAfterReturn.
vitalybuka updated this object.
vitalybuka added reviewers: kcc, eugenis, aizatsky.
vitalybuka added a subscriber: llvm-commits.
vitalybuka updated this revision to Diff 58868.May 27 2016, 5:14 PM

Few more.

eugenis accepted this revision.May 31 2016, 11:28 AM
eugenis edited edge metadata.

LGTM

This revision is now accepted and ready to land.May 31 2016, 11:28 AM
Closed by commit rL271447: [asan] Rename *UAR* into *UseAfterReturn* (authored by vitalybuka). · Explain WhyJun 1 2016, 5:13 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Transforms/
Instrumentation/
14 lines

Diff 58868

lib/Transforms/Instrumentation/AddressSanitizer.cpp

Show First 20 Lines • Show All 110 Lines • ▼ Show 20 Lines
static const char *const kSanCovGenPrefix = "__sancov_gen_"; static const char *const kSanCovGenPrefix = "__sancov_gen_";
static const char *const kAsanPoisonStackMemoryName = static const char *const kAsanPoisonStackMemoryName =
"__asan_poison_stack_memory"; "__asan_poison_stack_memory";
static const char *const kAsanUnpoisonStackMemoryName = static const char *const kAsanUnpoisonStackMemoryName =
"__asan_unpoison_stack_memory"; "__asan_unpoison_stack_memory";
static const char *const kAsanGlobalsRegisteredFlagName = static const char *const kAsanGlobalsRegisteredFlagName =
"__asan_globals_registered"; "__asan_globals_registered";
static const char *const kAsanOptionDetectUAR = static const char *const kAsanOptionDetectUseAfterReturn =
"__asan_option_detect_stack_use_after_return"; "__asan_option_detect_stack_use_after_return";
static const char *const kAsanAllocaPoison = "__asan_alloca_poison"; static const char *const kAsanAllocaPoison = "__asan_alloca_poison";
static const char *const kAsanAllocasUnpoison = "__asan_allocas_unpoison"; static const char *const kAsanAllocasUnpoison = "__asan_allocas_unpoison";
// Accesses sizes are powers of two: 1, 2, 4, 8, 16. // Accesses sizes are powers of two: 1, 2, 4, 8, 16.
static const size_t kNumberOfAccessSizes = 5; static const size_t kNumberOfAccessSizes = 5;
▲ Show 20 Lines • Show All 1,927 Lines • ▼ Show 20 Linesvoid FunctionStackPoisoner::poisonStack() {
Value *FakeStack; Value *FakeStack;
Value *LocalStackBase; Value *LocalStackBase;
if (DoStackMalloc) { if (DoStackMalloc) {
// void *FakeStack = __asan_option_detect_stack_use_after_return // void *FakeStack = __asan_option_detect_stack_use_after_return
// ? __asan_stack_malloc_N(LocalStackSize) // ? __asan_stack_malloc_N(LocalStackSize)
// : nullptr; // : nullptr;
// void *LocalStackBase = (FakeStack) ? FakeStack : alloca(LocalStackSize); // void *LocalStackBase = (FakeStack) ? FakeStack : alloca(LocalStackSize);
Constant *OptionDetectUAR = F.getParent()->getOrInsertGlobal( Constant *OptionDetectUseAfterReturn = F.getParent()->getOrInsertGlobal(
kAsanOptionDetectUAR, IRB.getInt32Ty()); kAsanOptionDetectUseAfterReturn, IRB.getInt32Ty());
Value *UARIsEnabled = Value *UseAfterReturnIsEnabled =
IRB.CreateICmpNE(IRB.CreateLoad(OptionDetectUAR), IRB.CreateICmpNE(IRB.CreateLoad(OptionDetectUseAfterReturn),
Constant::getNullValue(IRB.getInt32Ty())); Constant::getNullValue(IRB.getInt32Ty()));
Instruction *Term = Instruction *Term =
SplitBlockAndInsertIfThen(UARIsEnabled, InsBefore, false); SplitBlockAndInsertIfThen(UseAfterReturnIsEnabled, InsBefore, false);
IRBuilder<> IRBIf(Term); IRBuilder<> IRBIf(Term);
IRBIf.SetCurrentDebugLocation(EntryDebugLocation); IRBIf.SetCurrentDebugLocation(EntryDebugLocation);
StackMallocIdx = StackMallocSizeClass(LocalStackSize); StackMallocIdx = StackMallocSizeClass(LocalStackSize);
assert(StackMallocIdx <= kMaxAsanStackMallocSizeClass); assert(StackMallocIdx <= kMaxAsanStackMallocSizeClass);
Value *FakeStackValue = Value *FakeStackValue =
IRBIf.CreateCall(AsanStackMallocFunc[StackMallocIdx], IRBIf.CreateCall(AsanStackMallocFunc[StackMallocIdx],
ConstantInt::get(IntptrTy, LocalStackSize)); ConstantInt::get(IntptrTy, LocalStackSize));
IRB.SetInsertPoint(InsBefore); IRB.SetInsertPoint(InsBefore);
IRB.SetCurrentDebugLocation(EntryDebugLocation); IRB.SetCurrentDebugLocation(EntryDebugLocation);
FakeStack = createPHI(IRB, UARIsEnabled, FakeStackValue, Term, FakeStack = createPHI(IRB, UseAfterReturnIsEnabled, FakeStackValue, Term,
ConstantInt::get(IntptrTy, 0)); ConstantInt::get(IntptrTy, 0));
Value *NoFakeStack = Value *NoFakeStack =
IRB.CreateICmpEQ(FakeStack, Constant::getNullValue(IntptrTy)); IRB.CreateICmpEQ(FakeStack, Constant::getNullValue(IntptrTy));
Term = SplitBlockAndInsertIfThen(NoFakeStack, InsBefore, false); Term = SplitBlockAndInsertIfThen(NoFakeStack, InsBefore, false);
IRBIf.SetInsertPoint(Term); IRBIf.SetInsertPoint(Term);
IRBIf.SetCurrentDebugLocation(EntryDebugLocation); IRBIf.SetCurrentDebugLocation(EntryDebugLocation);
Value *AllocaValue = Value *AllocaValue =
▲ Show 20 Lines • Show All 232 Lines • Show Last 20 Lines