<div dir="ltr">Reverted with r277071.<br></div><br><div class="gmail_quote"><div dir="ltr">On Thu, Jul 28, 2016 at 5:19 PM Vitaly Buka <<a href="mailto:vitalybuka@google.com">vitalybuka@google.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">No. It was mistake and already reverted. It supposed to be a part of <a href="https://reviews.llvm.org/D22842" target="_blank">https://reviews.llvm.org/D22842</a></div><br><div class="gmail_quote"><div dir="ltr">On Thu, Jul 28, 2016 at 5:16 PM David Majnemer <<a href="mailto:david.majnemer@gmail.com" target="_blank">david.majnemer@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Did you intend to commit with this message?</div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Jul 28, 2016 at 6:50 PM, Vitaly Buka via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: vitalybuka<br>
Date: Thu Jul 28 17:50:45 2016<br>
New Revision: 277067<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=277067&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=277067&view=rev</a><br>
Log:<br>
maned<br>
<br>
Added:<br>
llvm/trunk/test/Transforms/InstCombine/lifetime-asan.ll<br>
Modified:<br>
llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp<br>
<br>
Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp?rev=277067&r1=277066&r2=277067&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp?rev=277067&r1=277066&r2=277067&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp Thu Jul 28 17:50:45 2016<br>
@@ -1211,10 +1211,6 @@ static bool removeTriviallyEmptyRange(In<br>
unsigned EndID, InstCombiner &IC) {<br>
assert(I.getIntrinsicID() == StartID &&<br>
"Start intrinsic does not have expected ID");<br>
- // Even if the range is empty asan need to poison memory to detect invalid<br>
- // access latter.<br>
- if (ClUseAfterScope)<br>
- return false;<br>
BasicBlock::iterator BI(I), BE(I.getParent()->end());<br>
for (++BI; BI != BE; ++BI) {<br>
if (auto *E = dyn_cast<IntrinsicInst>(BI)) {<br>
@@ -2248,11 +2244,18 @@ Instruction *InstCombiner::visitCallInst<br>
return eraseInstFromFunction(CI);<br>
break;<br>
}<br>
- case Intrinsic::lifetime_start:<br>
+ case Intrinsic::lifetime_start: {<br>
+ const Function *func = II->getFunction();<br>
+ // Asan needs to poison memory to detect invalid access possible even for<br>
+ // empty lifetime range.<br>
+ if (func && func->hasFnAttribute(Attribute::SanitizeAddress))<br>
+ break;<br>
+<br>
if (removeTriviallyEmptyRange(*II, Intrinsic::lifetime_start,<br>
Intrinsic::lifetime_end, *this))<br>
return nullptr;<br>
break;<br>
+ }<br>
case Intrinsic::assume: {<br>
Value *IIOperand = II->getArgOperand(0);<br>
// Remove an assume if it is immediately followed by an identical assume.<br>
@@ -2483,7 +2486,6 @@ static IntrinsicInst *findInitTrampoline<br>
<br>
/// Improvements for call and invoke instructions.<br>
Instruction *InstCombiner::visitCallSite(CallSite CS) {<br>
-<br>
if (isAllocLikeFn(CS.getInstruction(), TLI))<br>
return visitAllocSite(*CS.getInstruction());<br>
<br>
<br>
Added: llvm/trunk/test/Transforms/InstCombine/lifetime-asan.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/lifetime-asan.ll?rev=277067&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/lifetime-asan.ll?rev=277067&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/InstCombine/lifetime-asan.ll (added)<br>
+++ llvm/trunk/test/Transforms/InstCombine/lifetime-asan.ll Thu Jul 28 17:50:45 2016<br>
@@ -0,0 +1,37 @@<br>
+; RUN: opt < %s -instcombine -S | FileCheck %s<br>
+<br>
+declare void @llvm.lifetime.start(i64, i8* nocapture)<br>
+declare void @llvm.lifetime.end(i64, i8* nocapture)<br>
+declare void @foo(i8* nocapture)<br>
+<br>
+define void @asan() sanitize_address {<br>
+entry:<br>
+ ; CHECK-LABEL: @asan(<br>
+ %text = alloca [1 x i8], align 1<br>
+ %0 = getelementptr inbounds [1 x i8], [1 x i8]* %text, i64 0, i64 0<br>
+<br>
+ call void @llvm.lifetime.start(i64 1, i8* %0)<br>
+ call void @llvm.lifetime.end(i64 1, i8* %0)<br>
+ ; CHECK: call void @llvm.lifetime.start<br>
+ ; CHECK-NEXT: call void @llvm.lifetime.end<br>
+<br>
+ call void @foo(i8* %0) ; Keep alloca alive<br>
+<br>
+ ret void<br>
+}<br>
+<br>
+<br>
+define void @no_asan() {<br>
+entry:<br>
+ ; CHECK-LABEL: @no_asan(<br>
+ %text = alloca [1 x i8], align 1<br>
+ %0 = getelementptr inbounds [1 x i8], [1 x i8]* %text, i64 0, i64 0<br>
+<br>
+ call void @llvm.lifetime.start(i64 1, i8* %0)<br>
+ call void @llvm.lifetime.end(i64 1, i8* %0)<br>
+ ; CHECK-NO: call void @llvm.lifetime<br>
+<br>
+ call void @foo(i8* %0) ; Keep alloca alive<br>
+<br>
+ ret void<br>
+}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>
</blockquote></div></blockquote></div>