diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Analysis/InlineCost.cpp | 8 | ||||
| -rw-r--r-- | llvm/test/Transforms/Inline/alloca_test.ll | 30 |
2 files changed, 34 insertions, 4 deletions
diff --git a/llvm/lib/Analysis/InlineCost.cpp b/llvm/lib/Analysis/InlineCost.cpp index 0a32ef8a83b..d3b2930d7ea 100644 --- a/llvm/lib/Analysis/InlineCost.cpp +++ b/llvm/lib/Analysis/InlineCost.cpp @@ -329,12 +329,12 @@ bool CallAnalyzer::accumulateGEPOffset(GEPOperator &GEP, APInt &Offset) { bool CallAnalyzer::visitAlloca(AllocaInst &I) { // Check whether inlining will turn a dynamic alloca into a static - // alloca, and handle that case. + // alloca and handle that case. if (I.isArrayAllocation()) { - if (Constant *Size = SimplifiedValues.lookup(I.getArraySize())) { - ConstantInt *AllocSize = dyn_cast<ConstantInt>(Size); - assert(AllocSize && "Allocation size not a constant int?"); + Constant *Size = SimplifiedValues.lookup(I.getArraySize()); + if (auto *AllocSize = dyn_cast_or_null<ConstantInt>(Size)) { Type *Ty = I.getAllocatedType(); + // FIXME: This can't be right. AllocatedSize is in *bytes*. AllocatedSize += Ty->getPrimitiveSizeInBits() * AllocSize->getZExtValue(); return Base::visitAlloca(I); } diff --git a/llvm/test/Transforms/Inline/alloca_test.ll b/llvm/test/Transforms/Inline/alloca_test.ll index 1894c434131..c9d8f11cd84 100644 --- a/llvm/test/Transforms/Inline/alloca_test.ll +++ b/llvm/test/Transforms/Inline/alloca_test.ll @@ -1,3 +1,4 @@ +; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; This test ensures that alloca instructions in the entry block for an inlined ; function are moved to the top of the function they are inlined into. ; @@ -23,3 +24,32 @@ Entry: ret i32 %Y } +; https://llvm.org/bugs/show_bug.cgi?id=27277 +; Don't assume that the size is a ConstantInt (an undef value is also a constant). + +define void @PR27277(i32 %p1) { +; CHECK-LABEL: @PR27277( +; CHECK-NEXT: [[VLA:%.*]] = alloca double, i32 %p1 +; CHECK-NEXT: call void @PR27277(i32 undef) +; CHECK-NEXT: ret void +; + %vla = alloca double, i32 %p1 + call void @PR27277(i32 undef) + ret void +} + +; Don't assume that the size is a ConstantInt (a ConstExpr is also a constant). + +@GV = common global i32* null + +define void @PR27277_part2(i32 %p1) { +; CHECK-LABEL: @PR27277_part2( +; CHECK-NEXT: [[VLA:%.*]] = alloca double, i32 %p1 +; CHECK-NEXT: call void @PR27277_part2(i32 ptrtoint (i32** @GV to i32)) +; CHECK-NEXT: ret void +; + %vla = alloca double, i32 %p1 + call void @PR27277_part2(i32 ptrtoint (i32** @GV to i32)) + ret void +} + |
