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

maned

Browse Source 
llvm-svn: 277067
This commit is contained in:
Vitaly Buka 2016-07-28 22:50:45 +00:00
parent 1effa6601e
commit 4e37730172
2 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Transforms/InstCombine/InstCombineCalls.cpp
View File

@ -1211,10 +1211,6 @@ static bool removeTriviallyEmptyRange(IntrinsicInst &I, unsigned StartID,
unsigned EndID, InstCombiner &IC) {
assert(I.getIntrinsicID() == StartID &&
"Start intrinsic does not have expected ID");
// Even if the range is empty asan need to poison memory to detect invalid
// access latter.
if (ClUseAfterScope)
return false;
BasicBlock::iterator BI(I), BE(I.getParent()->end());
for (++BI; BI != BE; ++BI) {
if (auto *E = dyn_cast<IntrinsicInst>(BI)) {
@ -2248,11 +2244,18 @@ Instruction *InstCombiner::visitCallInst(CallInst &CI) {
return eraseInstFromFunction(CI);
break;
}
case Intrinsic::lifetime_start:
case Intrinsic::lifetime_start: {
const Function *func = II->getFunction();
// Asan needs to poison memory to detect invalid access possible even for
// empty lifetime range.
if (func && func->hasFnAttribute(Attribute::SanitizeAddress))
break;
if (removeTriviallyEmptyRange(*II, Intrinsic::lifetime_start,
Intrinsic::lifetime_end, *this))
return nullptr;
break;
}
case Intrinsic::assume: {
Value *IIOperand = II->getArgOperand(0);
// Remove an assume if it is immediately followed by an identical assume.
@ -2483,7 +2486,6 @@ static IntrinsicInst *findInitTrampoline(Value *Callee) {
/// Improvements for call and invoke instructions.
Instruction *InstCombiner::visitCallSite(CallSite CS) {
if (isAllocLikeFn(CS.getInstruction(), TLI))
return visitAllocSite(*CS.getInstruction());

37
test/Transforms/InstCombine/lifetime-asan.ll Normal file
View File

@ -0,0 +1,37 @@
; RUN: opt < %s -instcombine -S | FileCheck %s
declare void @llvm.lifetime.start(i64, i8* nocapture)
declare void @llvm.lifetime.end(i64, i8* nocapture)
declare void @foo(i8* nocapture)
define void @asan() sanitize_address {
entry:
; CHECK-LABEL: @asan(
%text = alloca [1 x i8], align 1
%0 = getelementptr inbounds [1 x i8], [1 x i8]* %text, i64 0, i64 0
call void @llvm.lifetime.start(i64 1, i8* %0)
call void @llvm.lifetime.end(i64 1, i8* %0)
; CHECK: call void @llvm.lifetime.start
; CHECK-NEXT: call void @llvm.lifetime.end
call void @foo(i8* %0) ; Keep alloca alive
ret void
}
define void @no_asan() {
entry:
; CHECK-LABEL: @no_asan(
%text = alloca [1 x i8], align 1
%0 = getelementptr inbounds [1 x i8], [1 x i8]* %text, i64 0, i64 0
call void @llvm.lifetime.start(i64 1, i8* %0)
call void @llvm.lifetime.end(i64 1, i8* %0)
; CHECK-NO: call void @llvm.lifetime
call void @foo(i8* %0) ; Keep alloca alive
ret void
}