<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Oct 6, 2017 at 2:20 PM, Reid Kleckner <span dir="ltr"><<a href="mailto:rnk@google.com" target="_blank">rnk@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">This appears to have caused a bootstrap failure on Windows:<div><a href="http://lab.llvm.org:8011/builders/clang-x64-ninja-win7/builds/6884" target="_blank">http://lab.llvm.org:8011/<wbr>builders/clang-x64-ninja-win7/<wbr>builds/6884</a><br></div><div><a href="http://lab.llvm.org:8011/builders/clang-x86-windows-msvc2015/builds/7611" target="_blank">http://lab.llvm.org:8011/<wbr>builders/clang-x86-windows-<wbr>msvc2015/builds/7611</a><br></div><div><br></div><div>I am going to revert and try to reproduce. It looks like clang ends up emitting an error on valid code.</div></div></blockquote><div><br></div><div><br></div><div>Please help with the reproducible -- it will be hard for me to get a repro on windows.</div><div><br></div><div>thanks,</div><div><br></div><div>David</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Oct 5, 2017 at 10:15 PM, Xinliang David Li 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: davidxl<br>
Date: Thu Oct 5 22:15:25 2017<br>
New Revision: 315044<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=315044&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject?rev=315044&view=rev</a><br>
Log:<br>
Roll forward r314928<br>
<br>
Fixed ThinLTO bootstrap failure : track new<br>
bitcast per incomingVal. Added new tests.<br>
<br>
Added:<br>
llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr1.ll<br>
- copied, changed from r314960, llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr1.ll<br>
llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr2.ll<br>
- copied, changed from r314960, llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr2.ll<br>
llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr3.ll<br>
- copied, changed from r314960, llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr3.ll<br>
llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr4.ll<br>
- copied, changed from r314960, llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr4.ll<br>
llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr5.ll<br>
llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr6.ll<br>
Modified:<br>
llvm/trunk/lib/Transforms/Inst<wbr>Combine/InstCombineInternal.h<br>
llvm/trunk/lib/Transforms/Inst<wbr>Combine/InstCombinePHI.cpp<br>
<br>
Modified: llvm/trunk/lib/Transforms/Inst<wbr>Combine/InstCombineInternal.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineInternal.h?rev=315044&r1=315043&r2=315044&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/lib/Transform<wbr>s/InstCombine/InstCombineInter<wbr>nal.h?rev=315044&r1=315043&r2=<wbr>315044&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Transforms/Inst<wbr>Combine/InstCombineInternal.h (original)<br>
+++ llvm/trunk/lib/Transforms/Inst<wbr>Combine/InstCombineInternal.h Thu Oct 5 22:15:25 2017<br>
@@ -670,6 +670,10 @@ private:<br>
Instruction *FoldPHIArgGEPIntoPHI(PHINode &PN);<br>
Instruction *FoldPHIArgLoadIntoPHI(PHINode &PN);<br>
Instruction *FoldPHIArgZextsIntoPHI(PHINod<wbr>e &PN);<br>
+ /// If an integer typed PHI has only one use which is an IntToPtr operation,<br>
+ /// replace the PHI with an existing pointer typed PHI if it exists. Otherwise<br>
+ /// insert a new pointer typed PHI and replace the original one.<br>
+ Instruction *FoldIntegerTypedPHI(PHINode &PN);<br>
<br>
/// Helper function for FoldPHIArgXIntoPHI() to set debug location for the<br>
/// folded operation.<br>
<br>
Modified: llvm/trunk/lib/Transforms/Inst<wbr>Combine/InstCombinePHI.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombinePHI.cpp?rev=315044&r1=315043&r2=315044&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/lib/Transform<wbr>s/InstCombine/InstCombinePHI.<wbr>cpp?rev=315044&r1=315043&r2=<wbr>315044&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Transforms/Inst<wbr>Combine/InstCombinePHI.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/Inst<wbr>Combine/InstCombinePHI.cpp Thu Oct 5 22:15:25 2017<br>
@@ -40,6 +40,237 @@ void InstCombiner::PHIArgMergedDebu<wbr>gLoc(<br>
}<br>
}<br>
<br>
+// Replace Integer typed PHI PN if the PHI's value is used as a pointer value.<br>
+// If there is an existing pointer typed PHI that produces the same value as PN,<br>
+// replace PN and the IntToPtr operation with it. Otherwise, synthesize a new<br>
+// PHI node:<br>
+//<br>
+// Case-1:<br>
+// bb1:<br>
+// int_init = PtrToInt(ptr_init)<br>
+// br label %bb2<br>
+// bb2:<br>
+// int_val = PHI([int_init, %bb1], [int_val_inc, %bb2]<br>
+// ptr_val = PHI([ptr_init, %bb1], [ptr_val_inc, %bb2]<br>
+// ptr_val2 = IntToPtr(int_val)<br>
+// ...<br>
+// use(ptr_val2)<br>
+// ptr_val_inc = ...<br>
+// inc_val_inc = PtrToInt(ptr_val_inc)<br>
+//<br>
+// ==><br>
+// bb1:<br>
+// br label %bb2<br>
+// bb2:<br>
+// ptr_val = PHI([ptr_init, %bb1], [ptr_val_inc, %bb2]<br>
+// ...<br>
+// use(ptr_val)<br>
+// ptr_val_inc = ...<br>
+//<br>
+// Case-2:<br>
+// bb1:<br>
+// int_ptr = BitCast(ptr_ptr)<br>
+// int_init = Load(int_ptr)<br>
+// br label %bb2<br>
+// bb2:<br>
+// int_val = PHI([int_init, %bb1], [int_val_inc, %bb2]<br>
+// ptr_val2 = IntToPtr(int_val)<br>
+// ...<br>
+// use(ptr_val2)<br>
+// ptr_val_inc = ...<br>
+// inc_val_inc = PtrToInt(ptr_val_inc)<br>
+// ==><br>
+// bb1:<br>
+// ptr_init = Load(ptr_ptr)<br>
+// br label %bb2<br>
+// bb2:<br>
+// ptr_val = PHI([ptr_init, %bb1], [ptr_val_inc, %bb2]<br>
+// ...<br>
+// use(ptr_val)<br>
+// ptr_val_inc = ...<br>
+// ...<br>
+//<br>
+Instruction *InstCombiner::FoldIntegerType<wbr>dPHI(PHINode &PN) {<br>
+ if (!PN.getType()->isIntegerTy())<br>
+ return nullptr;<br>
+ if (!PN.hasOneUse())<br>
+ return nullptr;<br>
+<br>
+ auto *IntToPtr = dyn_cast<IntToPtrInst>(PN.user<wbr>_back());<br>
+ if (!IntToPtr)<br>
+ return nullptr;<br>
+<br>
+ // Check if the pointer is actually used as pointer:<br>
+ auto HasPointerUse = [](Instruction *IIP) {<br>
+ for (User *U : IIP->users()) {<br>
+ Value *Ptr = nullptr;<br>
+ if (LoadInst *LoadI = dyn_cast<LoadInst>(U)) {<br>
+ Ptr = LoadI->getPointerOperand();<br>
+ } else if (StoreInst *SI = dyn_cast<StoreInst>(U)) {<br>
+ Ptr = SI->getPointerOperand();<br>
+ } else if (GetElementPtrInst *GI = dyn_cast<GetElementPtrInst>(U)<wbr>) {<br>
+ Ptr = GI->getPointerOperand();<br>
+ }<br>
+<br>
+ if (Ptr && Ptr == IIP)<br>
+ return true;<br>
+ }<br>
+ return false;<br>
+ };<br>
+<br>
+ if (!HasPointerUse(IntToPtr))<br>
+ return nullptr;<br>
+<br>
+ if (DL.getPointerSizeInBits(IntTo<wbr>Ptr->getAddressSpace()) !=<br>
+ DL.getTypeSizeInBits(IntToPtr-<wbr>>getOperand(0)->getType()))<br>
+ return nullptr;<br>
+<br>
+ SmallVector<Value *, 4> AvailablePtrVals;<br>
+ for (unsigned i = 0; i != PN.getNumIncomingValues(); ++i) {<br>
+ Value *Arg = PN.getIncomingValue(i);<br>
+<br>
+ // First look backward:<br>
+ if (auto *PI = dyn_cast<PtrToIntInst>(Arg)) {<br>
+ AvailablePtrVals.emplace_back(<wbr>PI->getOperand(0));<br>
+ continue;<br>
+ }<br>
+<br>
+ // Next look forward:<br>
+ Value *ArgIntToPtr = nullptr;<br>
+ for (User *U : Arg->users()) {<br>
+ if (isa<IntToPtrInst>(U) && U->getType() == IntToPtr->getType() &&<br>
+ (DT.dominates(cast<Instruction<wbr>>(U), PN.getIncomingBlock(i)) ||<br>
+ cast<Instruction>(U)->getPare<wbr>nt() == PN.getIncomingBlock(i))) {<br>
+ ArgIntToPtr = U;<br>
+ break;<br>
+ }<br>
+ }<br>
+<br>
+ if (ArgIntToPtr) {<br>
+ AvailablePtrVals.emplace_back(<wbr>ArgIntToPtr);<br>
+ continue;<br>
+ }<br>
+<br>
+ // If Arg is defined by a PHI, allow it. This will also create<br>
+ // more opportunities iteratively.<br>
+ if (isa<PHINode>(Arg)) {<br>
+ AvailablePtrVals.emplace_back(<wbr>Arg);<br>
+ continue;<br>
+ }<br>
+<br>
+ // For a single use integer load:<br>
+ auto *LoadI = dyn_cast<LoadInst>(Arg);<br>
+ if (!LoadI)<br>
+ return nullptr;<br>
+<br>
+ if (!LoadI->hasOneUse())<br>
+ return nullptr;<br>
+<br>
+ // Push the integer typed Load instruction into the available<br>
+ // value set, and fix it up later when the pointer typed PHI<br>
+ // is synthesized.<br>
+ AvailablePtrVals.emplace_back(<wbr>LoadI);<br>
+ }<br>
+<br>
+ // Now search for a matching PHI<br>
+ auto *BB = PN.getParent();<br>
+ assert(AvailablePtrVals.size() == PN.getNumIncomingValues() &&<br>
+ "Not enough available ptr typed incoming values");<br>
+ PHINode *MatchingPtrPHI = nullptr;<br>
+ for (auto II = BB->begin(), EI = BasicBlock::iterator(BB->getFi<wbr>rstNonPHI());<br>
+ II != EI; II++) {<br>
+ PHINode *PtrPHI = dyn_cast<PHINode>(II);<br>
+ if (!PtrPHI || PtrPHI == &PN || PtrPHI->getType() != IntToPtr->getType())<br>
+ continue;<br>
+ MatchingPtrPHI = PtrPHI;<br>
+ for (unsigned i = 0; i != PtrPHI->getNumIncomingValues()<wbr>; ++i) {<br>
+ if (AvailablePtrVals[i] != PtrPHI->getIncomingValue(i)) {<br>
+ MatchingPtrPHI = nullptr;<br>
+ break;<br>
+ }<br>
+ }<br>
+<br>
+ if (MatchingPtrPHI)<br>
+ break;<br>
+ }<br>
+<br>
+ if (MatchingPtrPHI) {<br>
+ assert(MatchingPtrPHI->getType<wbr>() == IntToPtr->getType() &&<br>
+ "Phi's Type does not match with IntToPtr");<br>
+ // The PtrToCast + IntToPtr will be simplified later<br>
+ return CastInst::CreateBitOrPointerCa<wbr>st(MatchingPtrPHI,<br>
+ IntToPtr->getOperand(0)->getTy<wbr>pe());<br>
+ }<br>
+<br>
+ // If it requires a conversion for every PHI operand, do not do it.<br>
+ if (std::all_of(AvailablePtrVals.<wbr>begin(), AvailablePtrVals.end(),<br>
+ [&](Value *V) {<br>
+ return (V->getType() != IntToPtr->getType()) ||<br>
+ isa<IntToPtrInst>(V);<br>
+ }))<br>
+ return nullptr;<br>
+<br>
+ // If any of the operand that requires casting is a terminator<br>
+ // instruction, do not do it.<br>
+ if (std::any_of(AvailablePtrVals.<wbr>begin(), AvailablePtrVals.end(),<br>
+ [&](Value *V) {<br>
+ return (V->getType() != IntToPtr->getType()) &&<br>
+ isa<TerminatorInst>(V);<br>
+ }))<br>
+ return nullptr;<br>
+<br>
+ PHINode *NewPtrPHI = PHINode::Create(<br>
+ IntToPtr->getType(), PN.getNumIncomingValues(), PN.getName() + ".ptr");<br>
+<br>
+ InsertNewInstBefore(NewPtrPHI, PN);<br>
+ SmallDenseMap<Value *, Instruction *> Casts;<br>
+ for (unsigned i = 0; i != PN.getNumIncomingValues(); ++i) {<br>
+ auto *IncomingBB = PN.getIncomingBlock(i);<br>
+ auto *IncomingVal = AvailablePtrVals[i];<br>
+<br>
+ if (IncomingVal->getType() == IntToPtr->getType()) {<br>
+ NewPtrPHI->addIncoming(Incomin<wbr>gVal, IncomingBB);<br>
+ continue;<br>
+ }<br>
+<br>
+#ifndef NDEBUG<br>
+ LoadInst *LoadI = dyn_cast<LoadInst>(IncomingVal<wbr>);<br>
+ assert((isa<PHINode>(IncomingV<wbr>al) ||<br>
+ IncomingVal->getType()->isPoin<wbr>terTy() ||<br>
+ (LoadI && LoadI->hasOneUse())) &&<br>
+ "Can not replace LoadInst with multiple uses");<br>
+#endif<br>
+ // Need to insert a BitCast.<br>
+ // For an integer Load instruction with a single use, the load + IntToPtr<br>
+ // cast will be simplified into a pointer load:<br>
+ // %v = load i64, i64* %a.ip, align 8<br>
+ // %v.cast = inttoptr i64 %v to float **<br>
+ // ==><br>
+ // %v.ptrp = bitcast i64 * %a.ip to float **<br>
+ // %v.cast = load float *, float ** %v.ptrp, align 8<br>
+ Instruction *&CI = Casts[IncomingVal];<br>
+ if (!CI) {<br>
+ CI = CastInst::CreateBitOrPointerCa<wbr>st(<br>
+ IncomingVal, IntToPtr->getType(), IncomingVal->getName() + ".ptr");<br>
+ if (auto *IncomingI = dyn_cast<Instruction>(Incoming<wbr>Val)) {<br>
+ BasicBlock::iterator InsertPos(IncomingI);<br>
+ InsertPos++;<br>
+ if (isa<PHINode>(IncomingI))<br>
+ InsertPos = IncomingI->getParent()->getFir<wbr>stInsertionPt();<br>
+ InsertNewInstBefore(CI, *InsertPos);<br>
+ } else {<br>
+ auto *InsertBB = &IncomingBB->getParent()->getE<wbr>ntryBlock();<br>
+ InsertNewInstBefore(CI, *InsertBB->getFirstInsertionPt<wbr>());<br>
+ }<br>
+ }<br>
+ NewPtrPHI->addIncoming(CI, IncomingBB);<br>
+ }<br>
+<br>
+ // The PtrToCast + IntToPtr will be simplified later<br>
+ return CastInst::CreateBitOrPointerCa<wbr>st(NewPtrPHI,<br>
+ IntToPtr->getOperand(0)->getTy<wbr>pe());<br>
+}<br>
+<br>
/// If we have something like phi [add (a,b), add(a,c)] and if a/b/c and the<br>
/// adds all have a single use, turn this into a phi and a single binop.<br>
Instruction *InstCombiner::FoldPHIArgBinOp<wbr>IntoPHI(PHINode &PN) {<br>
@@ -903,6 +1134,9 @@ Instruction *InstCombiner::visitPHINode(<br>
// this PHI only has a single use (a PHI), and if that PHI only has one use (a<br>
// PHI)... break the cycle.<br>
if (PN.hasOneUse()) {<br>
+ if (Instruction *Result = FoldIntegerTypedPHI(PN))<br>
+ return Result;<br>
+<br>
Instruction *PHIUser = cast<Instruction>(PN.user_back<wbr>());<br>
if (PHINode *PU = dyn_cast<PHINode>(PHIUser)) {<br>
SmallPtrSet<PHINode*, 16> PotentiallyDeadPHIs;<br>
<br>
Copied: llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr1.ll (from r314960, llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr1.ll)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/intptr1.ll?p2=llvm/trunk/test/Transforms/InstCombine/intptr1.ll&p1=llvm/trunk/test/Transforms/InstCombine/intptr1.ll&r1=314960&r2=315044&rev=315044&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/test/Transfor<wbr>ms/InstCombine/intptr1.ll?p2=<wbr>llvm/trunk/test/Transforms/<wbr>InstCombine/intptr1.ll&p1=<wbr>llvm/trunk/test/Transforms/<wbr>InstCombine/intptr1.ll&r1=<wbr>314960&r2=315044&rev=315044&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr1.ll (original)<br>
+++ llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr1.ll Thu Oct 5 22:15:25 2017<br>
@@ -1,6 +1,5 @@<br>
; RUN: opt < %s -instcombine -S | FileCheck %s<br>
<br>
-<br>
define void @test1(float* %a, float* readnone %a_end, i64* %b.i64) {<br>
; CHECK-LABEL: @test1<br>
entry:<br>
@@ -23,12 +22,15 @@ for.body:<br>
%tmp = inttoptr i64 %b.addr.02 to float*<br>
; CHECK-NOT: inttoptr i64<br>
%tmp1 = load float, float* %tmp, align 4<br>
+; CHECK: = load<br>
%mul.i = fmul float %tmp1, 4.200000e+01<br>
store float %mul.i, float* %a.addr.03, align 4<br>
%add = getelementptr inbounds float, float* %tmp, i64 1<br>
%<a href="http://add.int" rel="noreferrer" target="_blank">add.int</a> = ptrtoint float* %add to i64<br>
+; CHECK %add = getelementptr<br>
; CHECK-NOT: ptrtoint float*<br>
%incdec.ptr = getelementptr inbounds float, float* %a.addr.03, i64 1<br>
+; CHECK: %incdec.ptr =<br>
%cmp = icmp ult float* %incdec.ptr, %a_end<br>
br i1 %cmp, label %for.body, label %for.end<br>
<br>
@@ -97,12 +99,15 @@ for.body:<br>
%tmp = inttoptr i64 %b.addr.02 to float*<br>
; CHECK-NOT: inttoptr i64<br>
%tmp1 = load float, float* %tmp, align 4<br>
+; CHECK: = load<br>
%mul.i = fmul float %tmp1, 4.200000e+01<br>
store float %mul.i, float* %a.addr.03, align 4<br>
%add = getelementptr inbounds float, float* %tmp, i64 1<br>
+; CHECK: %add =<br>
%<a href="http://add.int" rel="noreferrer" target="_blank">add.int</a> = ptrtoint float* %add to i64<br>
; CHECK-NOT: ptrtoint float*<br>
%incdec.ptr = getelementptr inbounds float, float* %a.addr.03, i64 1<br>
+; CHECK: %incdec.ptr =<br>
%cmp = icmp ult float* %incdec.ptr, %a_end<br>
br i1 %cmp, label %for.body, label %for.end<br>
<br>
@@ -134,12 +139,15 @@ for.body:<br>
%tmp = inttoptr i64 %b.addr.02 to float*<br>
; CHECK-NOT: inttoptr i64<br>
%tmp1 = load float, float* %tmp, align 4<br>
+; CHECK: = load<br>
%mul.i = fmul float %tmp1, 4.200000e+01<br>
store float %mul.i, float* %a.addr.03, align 4<br>
%add = getelementptr inbounds float, float* %tmp, i64 1<br>
+; CHECK: %add = getelementptr<br>
%<a href="http://add.int" rel="noreferrer" target="_blank">add.int</a> = ptrtoint float* %add to i64<br>
; CHECK-NOT: ptrtoint float*<br>
%incdec.ptr = getelementptr inbounds float, float* %a.addr.03, i64 1<br>
+; CHECK: %incdec.ptr =<br>
%cmp = icmp ult float* %incdec.ptr, %a_end<br>
br i1 %cmp, label %for.body, label %for.end<br>
<br>
@@ -160,6 +168,7 @@ for.body.preheader:<br>
; CHECK: load float*, float**<br>
; CHECK-NOT: ptrtoint float*<br>
br label %for.body<br>
+; CHECK: br label %for.body<br>
<br>
for.body: ; preds = %for.body, %for.body.preheader<br>
%a.addr.03 = phi float* [ %incdec.ptr, %for.body ], [ %a, %for.body.preheader ]<br>
@@ -167,12 +176,15 @@ for.body:<br>
%tmp = inttoptr i64 %b.addr.02 to float*<br>
; CHECK-NOT: inttoptr i64<br>
%tmp1 = load float, float* %tmp, align 4<br>
+; CHECK: = load<br>
%mul.i = fmul float %tmp1, 4.200000e+01<br>
store float %mul.i, float* %a.addr.03, align 4<br>
%add = getelementptr inbounds float, float* %tmp, i64 1<br>
+; CHECK: %add =<br>
%<a href="http://add.int" rel="noreferrer" target="_blank">add.int</a> = ptrtoint float* %add to i64<br>
; CHECK-NOT: ptrtoint float*<br>
%incdec.ptr = getelementptr inbounds float, float* %a.addr.03, i64 1<br>
+; CHECK: %incdec.ptr =<br>
%cmp = icmp ult float* %incdec.ptr, %a_end<br>
br i1 %cmp, label %for.body, label %for.end<br>
<br>
<br>
Copied: llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr2.ll (from r314960, llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr2.ll)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/intptr2.ll?p2=llvm/trunk/test/Transforms/InstCombine/intptr2.ll&p1=llvm/trunk/test/Transforms/InstCombine/intptr2.ll&r1=314960&r2=315044&rev=315044&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/test/Transfor<wbr>ms/InstCombine/intptr2.ll?p2=<wbr>llvm/trunk/test/Transforms/<wbr>InstCombine/intptr2.ll&p1=<wbr>llvm/trunk/test/Transforms/<wbr>InstCombine/intptr2.ll&r1=<wbr>314960&r2=315044&rev=315044&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr2.ll (original)<br>
+++ llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr2.ll Thu Oct 5 22:15:25 2017<br>
@@ -11,23 +11,25 @@ for.body.preheader:<br>
; CHECK: bitcast<br>
; CHECK-NOT: ptrtoint<br>
br label %for.body<br>
+; CHECK: br label %for.body<br>
<br>
for.body: ; preds = %for.body, %for.body.preheader<br>
%a.addr.03 = phi float* [ %incdec.ptr, %for.body ], [ %a, %for.body.preheader ]<br>
%b.addr.02 = phi i64 [ %<a href="http://add.int" rel="noreferrer" target="_blank">add.int</a>, %for.body ], [ %b, %for.body.preheader ]<br>
-<br>
; CHECK: %a.addr.03 = phi float* [ %incdec.ptr, %for.body ], [ %a, %for.body.preheader ]<br>
; CHECK-NOT: phi i64<br>
-<br>
%tmp = inttoptr i64 %b.addr.02 to float*<br>
; CHECK-NOT: inttoptr<br>
%tmp1 = load float, float* %tmp, align 4<br>
+; CHECK: = load<br>
%mul.i = fmul float %tmp1, 4.200000e+01<br>
store float %mul.i, float* %a.addr.03, align 4<br>
%add = getelementptr inbounds float, float* %tmp, i64 1<br>
+; CHECK: %add =<br>
%<a href="http://add.int" rel="noreferrer" target="_blank">add.int</a> = ptrtoint float* %add to i64<br>
; CHECK-NOT: ptrtoint<br>
%incdec.ptr = getelementptr inbounds float, float* %a.addr.03, i64 1<br>
+; CHECK: %incdec.ptr =<br>
%cmp = icmp ult float* %incdec.ptr, %a_end<br>
br i1 %cmp, label %for.body, label %for.end<br>
<br>
<br>
Copied: llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr3.ll (from r314960, llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr3.ll)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/intptr3.ll?p2=llvm/trunk/test/Transforms/InstCombine/intptr3.ll&p1=llvm/trunk/test/Transforms/InstCombine/intptr3.ll&r1=314960&r2=315044&rev=315044&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/test/Transfor<wbr>ms/InstCombine/intptr3.ll?p2=<wbr>llvm/trunk/test/Transforms/<wbr>InstCombine/intptr3.ll&p1=<wbr>llvm/trunk/test/Transforms/<wbr>InstCombine/intptr3.ll&r1=<wbr>314960&r2=315044&rev=315044&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr3.ll (original)<br>
+++ llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr3.ll Thu Oct 5 22:15:25 2017<br>
@@ -1,6 +1,5 @@<br>
; RUN: opt < %s -instcombine -S | FileCheck %s<br>
<br>
-<br>
define void @test(float* %a, float* readnone %a_end, i64 %b) unnamed_addr {<br>
entry:<br>
%cmp1 = icmp ult float* %a, %a_end<br>
@@ -20,12 +19,15 @@ for.body:<br>
%l = load float, float* %b.addr.float, align 4<br>
%mul.i = fmul float %l, 4.200000e+01<br>
store float %mul.i, float* %a.addr.03, align 4<br>
+; CHECK: store float<br>
%b.addr.float.2 = inttoptr i64 %b.addr.i64 to float*<br>
; CHECK-NOT: inttoptr<br>
%b.addr.float.inc = getelementptr inbounds float, float* %b.addr.float.2, i64 1<br>
+; CHECK: %b.addr.float.inc =<br>
%b.addr.i64.inc = ptrtoint float* %b.addr.float.inc to i64<br>
; CHECK-NOT: ptrtoint<br>
%incdec.ptr = getelementptr inbounds float, float* %a.addr.03, i64 1<br>
+; CHECK: %incdec.ptr =<br>
%cmp = icmp ult float* %incdec.ptr, %a_end<br>
br i1 %cmp, label %for.body, label %for.end<br>
<br>
<br>
Copied: llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr4.ll (from r314960, llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr4.ll)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/intptr4.ll?p2=llvm/trunk/test/Transforms/InstCombine/intptr4.ll&p1=llvm/trunk/test/Transforms/InstCombine/intptr4.ll&r1=314960&r2=315044&rev=315044&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/test/Transfor<wbr>ms/InstCombine/intptr4.ll?p2=<wbr>llvm/trunk/test/Transforms/<wbr>InstCombine/intptr4.ll&p1=<wbr>llvm/trunk/test/Transforms/<wbr>InstCombine/intptr4.ll&r1=<wbr>314960&r2=315044&rev=315044&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr4.ll (original)<br>
+++ llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr4.ll Thu Oct 5 22:15:25 2017<br>
@@ -1,6 +1,5 @@<br>
; RUN: opt < %s -instcombine -S | FileCheck %s<br>
<br>
-<br>
define void @test(float* %a, float* readnone %a_end, i64 %b, float* %bf) unnamed_addr {<br>
entry:<br>
%cmp1 = icmp ult float* %a, %a_end<br>
@@ -15,27 +14,34 @@ bb2:<br>
<br>
for.body.preheader: ; preds = %entry<br>
%b.phi = phi i64 [%b, %bb1], [%bfi, %bb2]<br>
-; CHECK-LABEL: for.body.preheader<br>
-; CHECK-NOT: %b.phi = phi i64<br>
br label %for.body<br>
+; CHECK: for.body.preheader<br>
+; CHECK: %b.phi = phi<br>
+; CHECK: %b.phi.ptr =<br>
+; CHECK: br label %for.body<br>
<br>
for.body: ; preds = %for.body.preheader, %for.body<br>
-; CHECK-LABEL: for.body<br>
+; CHECK: for.body<br>
%a.addr.03 = phi float* [ %incdec.ptr, %for.body ], [ %a, %for.body.preheader ]<br>
%b.addr.float = phi float* [ %b.addr.float.inc, %for.body ], [ %b.float, %for.body.preheader ]<br>
%b.addr.i64 = phi i64 [ %b.addr.i64.inc, %for.body ], [ %b.phi, %for.body.preheader ]<br>
; CHECK: %a.addr.03 = phi float* [ %incdec.ptr, %for.body ], [ %a, %for.body.preheader ]<br>
-; CHECK-NEXT: %b.addr.float = phi float* [ %b.addr.float.inc, %for.body ], [ %b.float, %for.body.preheader ]<br>
-; CHECK-NOT: = %b.addr.i64<br>
+; CHECK-NEXT: %b.addr.float = phi float* [ %b.addr.float.inc, %for.body ], [ %b.float, %for.body.preheader ]<br>
+; CHECK-NEXT: %b.addr.i64.ptr = phi<br>
+; CHECK-NOT: = phi i64<br>
+; CHECK: = load<br>
%l = load float, float* %b.addr.float, align 4<br>
%mul.i = fmul float %l, 4.200000e+01<br>
store float %mul.i, float* %a.addr.03, align 4<br>
%b.addr.float.2 = inttoptr i64 %b.addr.i64 to float*<br>
-; CHECK-NOT: inttoptr<br>
%b.addr.float.inc = getelementptr inbounds float, float* %b.addr.float.2, i64 1<br>
+; CHECK: store float %mul.i<br>
+; CHECK-NOT: inttoptr<br>
+; CHECK: %b.addr.float.inc =<br>
%b.addr.i64.inc = ptrtoint float* %b.addr.float.inc to i64<br>
; CHECK-NOT: ptrtoint<br>
%incdec.ptr = getelementptr inbounds float, float* %a.addr.03, i64 1<br>
+; CHECK: %incdec.ptr =<br>
%cmp = icmp ult float* %incdec.ptr, %a_end<br>
br i1 %cmp, label %for.body, label %for.end<br>
<br>
<br>
Added: llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr5.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/intptr5.ll?rev=315044&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/test/Transfor<wbr>ms/InstCombine/intptr5.ll?rev=<wbr>315044&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr5.ll (added)<br>
+++ llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr5.ll Thu Oct 5 22:15:25 2017<br>
@@ -0,0 +1,56 @@<br>
+; RUN: opt < %s -instcombine -S | FileCheck %s<br>
+<br>
+define void @test(float* %a, float* readnone %a_end, i64 %b, float* %bf) unnamed_addr {<br>
+entry:<br>
+ %cmp1 = icmp ult float* %a, %a_end<br>
+ %b.float = inttoptr i64 %b to float*<br>
+ br i1 %cmp1, label %bb1, label %bb2<br>
+<br>
+bb1:<br>
+ br label %for.body.preheader<br>
+bb2:<br>
+ %bfi = ptrtoint float* %bf to i64<br>
+ br label %for.body.preheader<br>
+<br>
+for.body.preheader: ; preds = %entry<br>
+ %b.phi = phi i64 [%b, %bb1], [%bfi, %bb2]<br>
+ switch i64 %b, label %for.body [<br>
+ i64 1, label %for.body<br>
+ ]<br>
+; CHECK: for.body.preheader<br>
+; CHECK: %b.phi = phi<br>
+; CHECK: %b.phi.ptr =<br>
+; CHECK-NOT: %b.phi.ptr2 =<br>
+; CHECK: switch<br>
+<br>
+for.body: ; preds = %for.body.preheader, %for.body<br>
+; CHECK: for.body<br>
+ %a.addr.03 = phi float* [ %incdec.ptr, %for.body ], [ %a, %for.body.preheader ], [%a, %for.body.preheader]<br>
+ %b.addr.float = phi float* [ %b.addr.float.inc, %for.body ], [ %b.float, %for.body.preheader ], [%b.float, %for.body.preheader]<br>
+ %b.addr.i64 = phi i64 [ %b.addr.i64.inc, %for.body ], [ %b.phi, %for.body.preheader ], [ %b.phi, %for.body.preheader]<br>
+; CHECK: %a.addr.03 = phi float* [ %incdec.ptr, %for.body ], [ %a, %for.body.preheader ]<br>
+; CHECK-NEXT: %b.addr.float = phi float* [ %b.addr.float.inc, %for.body ], [ %b.float, %for.body.preheader ]<br>
+; CHECK-NEXT: %b.addr.i64.ptr = phi<br>
+; CHECK-NOT: = %b.addr.i64<br>
+; CHECK: = load<br>
+ %l = load float, float* %b.addr.float, align 4<br>
+ %mul.i = fmul float %l, 4.200000e+01<br>
+ store float %mul.i, float* %a.addr.03, align 4<br>
+ %b.addr.float.2 = inttoptr i64 %b.addr.i64 to float*<br>
+ %b.addr.float.inc = getelementptr inbounds float, float* %b.addr.float.2, i64 1<br>
+; CHECK: store float %mul.i<br>
+; CHECK-NOT: inttoptr<br>
+; CHECK: %b.addr.float.inc =<br>
+ %b.addr.i64.inc = ptrtoint float* %b.addr.float.inc to i64<br>
+; CHECK-NOT: ptrtoint<br>
+ %incdec.ptr = getelementptr inbounds float, float* %a.addr.03, i64 1<br>
+; CHECK: %incdec.ptr =<br>
+ %cmp = icmp ult float* %incdec.ptr, %a_end<br>
+ br i1 %cmp, label %for.body, label %for.end<br>
+<br>
+for.end: ; preds = %for.body, %entry<br>
+ ret void<br>
+}<br>
+<br>
+<br>
+<br>
<br>
Added: llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr6.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/intptr6.ll?rev=315044&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/test/Transfor<wbr>ms/InstCombine/intptr6.ll?rev=<wbr>315044&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr6.ll (added)<br>
+++ llvm/trunk/test/Transforms/Ins<wbr>tCombine/intptr6.ll Thu Oct 5 22:15:25 2017<br>
@@ -0,0 +1,90 @@<br>
+; RUN: opt < %s -instcombine -S<br>
+; no crash<br>
+<br>
+%A = type { %B }<br>
+%B = type { %C *}<br>
+%C = type <{ i32 (...)**, i32, [4 x i8] }><br>
+<br>
+$foo = comdat any<br>
+<br>
+@bar= external thread_local global %A, align 8<br>
+<br>
+declare i32 @__gxx_personality_v0(...)<br>
+<br>
+; Function Attrs: inlinehint sanitize_memory uwtable<br>
+define void @foo() local_unnamed_addr #0 comdat align 2 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {<br>
+entry:<br>
+ %0 = load %C*, %C** getelementptr inbounds (%A, %A* @bar, i64 0, i32 0, i32 0), align 8<br>
+ %1 = ptrtoint %C* %0 to i64<br>
+ %count.i.i.i23 = getelementptr inbounds %C, %C* %0, i64 0, i32 1<br>
+ store i32 0, i32* %count.i.i.i23, align 8<br>
+ %2 = invoke i8* @_Znwm() #3<br>
+ to label %invoke.cont unwind label %lpad<br>
+<br>
+invoke.cont: ; preds = %entry<br>
+ %call.i25 = invoke i8* @_Znwm() #3<br>
+ to label %call.i.noexc unwind label %lpad4<br>
+<br>
+call.i.noexc: ; preds = %invoke.cont<br>
+ invoke void @lazy()<br>
+ to label %invoke.cont5 unwind label %lpad.i<br>
+<br>
+lpad.i: ; preds = %call.i.noexc<br>
+ %3 = landingpad { i8*, i32 }<br>
+ cleanup<br>
+ br label %ehcleanup<br>
+<br>
+invoke.cont5: ; preds = %call.i.noexc<br>
+ %4 = ptrtoint i8* %call.i25 to i64<br>
+ invoke void @scale()<br>
+ to label %invoke.cont16 unwind label %lpad15<br>
+<br>
+invoke.cont16: ; preds = %invoke.cont5<br>
+ ret void<br>
+<br>
+lpad: ; preds = %entry<br>
+ %5 = landingpad { i8*, i32 }<br>
+ cleanup<br>
+ unreachable<br>
+<br>
+lpad4: ; preds = %invoke.cont<br>
+ %6 = landingpad { i8*, i32 }<br>
+ cleanup<br>
+ unreachable<br>
+<br>
+ehcleanup: ; preds = %lpad.i<br>
+ br label %ehcleanup21<br>
+<br>
+lpad15: ; preds = %invoke.cont5<br>
+ %7 = landingpad { i8*, i32 }<br>
+ cleanup<br>
+ br label %ehcleanup21<br>
+<br>
+ehcleanup21: ; preds = %lpad15, %ehcleanup<br>
+ %actual_other.sroa.0.0 = phi i64 [ %1, %ehcleanup ], [ %4, %lpad15 ]<br>
+ %8 = inttoptr i64 %actual_other.sroa.0.0 to %C*<br>
+ br i1 undef, label %_ZN4CGAL6HandleD2Ev.exit, label %land.lhs.true.i<br>
+<br>
+land.lhs.true.i: ; preds = %ehcleanup21<br>
+ %count.i = getelementptr inbounds %C, %C* %8, i64 0, i32 1<br>
+ %9 = load i32, i32* %count.i, align 8<br>
+ unreachable<br>
+<br>
+_ZN4CGAL6HandleD2Ev.exit: ; preds = %ehcleanup21<br>
+ resume { i8*, i32 } undef<br>
+}<br>
+<br>
+; Function Attrs: nobuiltin<br>
+declare noalias nonnull i8* @_Znwm() local_unnamed_addr #1<br>
+<br>
+; Function Attrs: sanitize_memory uwtable<br>
+declare void @scale() local_unnamed_addr #2 align 2<br>
+<br>
+; Function Attrs: sanitize_memory uwtable<br>
+declare void @lazy() unnamed_addr #2 align 2<br>
+<br>
+attributes #0 = { inlinehint sanitize_memory uwtable}<br>
+attributes #1 = { nobuiltin }<br>
+attributes #2 = { sanitize_memory uwtable }<br>
+attributes #3 = { builtin }<br>
+<br>
<br>
<br>
______________________________<wbr>_________________<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/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>
</blockquote></div><br></div></div>