[PATCH] D12997: [Inline] Use AssumptionCache from the right Function

[Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL248390: [Inline] Use AssumptionCache from the right Function (authored by vedantk).

Changed prior to commit:
  http://reviews.llvm.org/D12997?vs=35188&id=35514#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D12997

Files:
  llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp
  llvm/trunk/test/Transforms/Inline/inline-assume.ll

Index: llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp
===================================================================
--- llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp
+++ llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp
@@ -741,7 +741,7 @@
       // caller, then don't bother inserting the assumption.
       Value *Arg = CS.getArgument(I->getArgNo());
       if (getKnownAlignment(Arg, DL, CS.getInstruction(),
-                            &IFI.ACT->getAssumptionCache(*CalledFunc),
+                            &IFI.ACT->getAssumptionCache(*CS.getCaller()),
                             &DT) >= Align)
         continue;
 
Index: llvm/trunk/test/Transforms/Inline/inline-assume.ll
===================================================================
--- llvm/trunk/test/Transforms/Inline/inline-assume.ll
+++ llvm/trunk/test/Transforms/Inline/inline-assume.ll
@@ -0,0 +1,31 @@
+; RUN: opt -inline -S -o - < %s | FileCheck %s
+
+%0 = type opaque
+%struct.Foo = type { i32, %0* }
+
+; Test that we don't crash when inlining @bar (rdar://22521387).
+define void @foo(%struct.Foo* align 4 %a) {
+entry:
+  call fastcc void @bar(%struct.Foo* nonnull align 4 undef)
+
+; CHECK: call void @llvm.assume(i1 undef)
+; CHECK: unreachable
+
+  ret void
+}
+
+define fastcc void @bar(%struct.Foo* align 4 %a) {
+; CHECK-LABEL: @bar
+entry:
+  %b = getelementptr inbounds %struct.Foo, %struct.Foo* %a, i32 0, i32 1
+  br i1 undef, label %if.end, label %if.then.i.i
+
+if.then.i.i:
+  call void @llvm.assume(i1 undef)
+  unreachable
+
+if.end:
+  ret void
+}
+
+declare void @llvm.assume(i1)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D12997.35514.patch
Type: text/x-patch
Size: 1594 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150923/36db4c75/attachment.bin>