replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "[asan] Fix size of shadow incorrectly calculated in r279178" 

This reverts commit r279222.

Speculative revert in hope to fix asan crash on arm.

llvm-svn: 279276
This commit is contained in:
Vitaly Buka 2016-08-19 17:15:33 +00:00
parent 6e9f0309e9
commit c8f4d69c82
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
View File

@ -2237,8 +2237,10 @@ void FunctionStackPoisoner::poisonStack() {
IRBuilder<> IRBPoison(ThenTerm);
if (StackMallocIdx <= 4) {
int ClassSize = kMinStackMallocSize << StackMallocIdx;
ShadowBytesAfterReturn.resize(ClassSize >> Mapping.Scale,
kAsanStackUseAfterReturnMagic);
if ((int)ShadowBytesAfterReturn.size() != ClassSize) {
ShadowBytesAfterReturn.resize(ClassSize,
kAsanStackUseAfterReturnMagic);
}
poisonRedZones(ShadowBytesAfterReturn, IRBPoison, ShadowBase, true);
Value *SavedFlagPtrPtr = IRBPoison.CreateAdd(
FakeStack,

1
llvm/test/Instrumentation/AddressSanitizer/stack-poisoning.ll
View File

@ -44,7 +44,6 @@ entry:
; CHECK-UAR: store i64 -723401728380766731
; CHECK-UAR: store i64 -723401728380766731
; CHECK-UAR: store i64 -723401728380766731
; CHECK-UAR-NOT: store i64
; CHECK-UAR: store i8 0
; CHECK-UAR-NOT: store
; CHECK-UAR: label