RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 11:42:57 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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 072ba9f3b4
commit d935a78b57
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

1
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: 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: store i8 0
; CHECK-UAR-NOT: store ; CHECK-UAR-NOT: store
; CHECK-UAR: label ; CHECK-UAR: label