[llvm] fff8ec9 - [Attributor] H2S fix.
Stefan Stipanovic via llvm-commits
llvm-commits at lists.llvm.org
Tue Dec 17 11:42:48 PST 2019
Author: Stefan Stipanovic
Date: 2019-12-17T20:41:09+01:00
New Revision: fff8ec98139379968cc7cebb71d771cf58a39a5c
URL: https://github.com/llvm/llvm-project/commit/fff8ec98139379968cc7cebb71d771cf58a39a5c
DIFF: https://github.com/llvm/llvm-project/commit/fff8ec98139379968cc7cebb71d771cf58a39a5c.diff
LOG: [Attributor] H2S fix.
Summary: Fixing issues that were noticed in D71521
Reviewers: jdoerfert, lebedev.ri, uenoku
Subscribers:
Differential Revision: https://reviews.llvm.org/D71564
Added:
Modified:
llvm/lib/Transforms/IPO/Attributor.cpp
llvm/test/Transforms/Attributor/heap_to_stack.ll
Removed:
################################################################################
diff --git a/llvm/lib/Transforms/IPO/Attributor.cpp b/llvm/lib/Transforms/IPO/Attributor.cpp
index 846af427ffa7..cd305ee18ebf 100644
--- a/llvm/lib/Transforms/IPO/Attributor.cpp
+++ b/llvm/lib/Transforms/IPO/Attributor.cpp
@@ -4335,7 +4335,7 @@ ChangeStatus AAHeapToStackImpl::updateImpl(Attributor &A) {
if (IsMalloc) {
if (auto *Size = dyn_cast<ConstantInt>(I.getOperand(0)))
- if (Size->getValue().sle(MaxHeapToStackSize))
+ if (Size->getValue().ule(MaxHeapToStackSize))
if (UsesCheck(I) || FreeCheck(I)) {
MallocCalls.insert(&I);
return true;
@@ -4345,7 +4345,7 @@ ChangeStatus AAHeapToStackImpl::updateImpl(Attributor &A) {
if (auto *Num = dyn_cast<ConstantInt>(I.getOperand(0)))
if (auto *Size = dyn_cast<ConstantInt>(I.getOperand(1)))
if ((Size->getValue().umul_ov(Num->getValue(), Overflow))
- .sle(MaxHeapToStackSize))
+ .ule(MaxHeapToStackSize))
if (!Overflow && (UsesCheck(I) || FreeCheck(I))) {
MallocCalls.insert(&I);
return true;
diff --git a/llvm/test/Transforms/Attributor/heap_to_stack.ll b/llvm/test/Transforms/Attributor/heap_to_stack.ll
index bac012539971..3d8b1b3aacea 100644
--- a/llvm/test/Transforms/Attributor/heap_to_stack.ll
+++ b/llvm/test/Transforms/Attributor/heap_to_stack.ll
@@ -313,15 +313,27 @@ define i32 @test13() {
define i32 @test_sle() {
%1 = tail call noalias i8* @malloc(i64 -1)
- ; FIXME: This should not be transformed
- ; CHECK: %1 = alloca i8, i64 -1
- ; CHECK-NEXT: @no_sync_func(i8* noalias nocapture nofree %1)
+ ; CHECK: %1 = tail call noalias i8* @malloc(i64 -1)
+ ; CHECK-NEXT: @no_sync_func(i8* noalias nofree %1)
tail call void @no_sync_func(i8* %1)
%2 = bitcast i8* %1 to i32*
store i32 10, i32* %2
%3 = load i32, i32* %2
tail call void @free(i8* %1)
- ; CHECK-NOT: tail call void @free(i8* noalias %1)
+ ; CHECK: tail call void @free(i8* noalias %1)
+ ret i32 %3
+}
+
+define i32 @test_overflow() {
+ %1 = tail call noalias i8* @calloc(i64 65537, i64 65537)
+ ; CHECK: %1 = tail call noalias i8* @calloc(i64 65537, i64 65537)
+ ; CHECK-NEXT: @no_sync_func(i8* noalias nofree %1)
+ tail call void @no_sync_func(i8* %1)
+ %2 = bitcast i8* %1 to i32*
+ store i32 10, i32* %2
+ %3 = load i32, i32* %2
+ tail call void @free(i8* %1)
+ ; CHECK: tail call void @free(i8* noalias %1)
ret i32 %3
}
More information about the llvm-commits
mailing list