From 2bd08527ff6ceb81105cac362c03789ff7d14c25 Mon Sep 17 00:00:00 2001 From: Mehdi Amini Date: Fri, 11 Sep 2015 01:33:48 +0000 Subject: [PATCH] Revert "[InstCombineCalls] Use isKnownNonNullAt() to check nullness of passing arguments at callsite" This reverts commit r247356. Breaks test/Transforms/InstCombine/pr8547.ll with: Wrong types for attribute: byval inalloca nest noalias nocapture nonnull readnone readonly sret dereferenceable(1) dereferenceable_or_null(1) %call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([10 x i8], [10 x i8]* @.str, i64 0, i64 0), i32 nonnull %conv2) #0 LLVM ERROR: Broken function found, compilation aborted! From: Mehdi Amini llvm-svn: 247371 --- llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp | 2 +- llvm/test/Transforms/InstCombine/call_nonnull_arg.ll | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 llvm/test/Transforms/InstCombine/call_nonnull_arg.ll diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp index 900953a..cc7d4be 100644 --- a/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp +++ b/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp @@ -1537,7 +1537,7 @@ Instruction *InstCombiner::visitCallSite(CallSite CS) { unsigned ArgNo = 0; for (Value *V : CS.args()) { if (!CS.paramHasAttr(ArgNo+1, Attribute::NonNull) && - isKnownNonNullAt(V, CS.getInstruction(), DT, TLI)) { + isKnownNonNull(V)) { AttributeSet AS = CS.getAttributes(); AS = AS.addAttribute(CS.getInstruction()->getContext(), ArgNo+1, Attribute::NonNull); diff --git a/llvm/test/Transforms/InstCombine/call_nonnull_arg.ll b/llvm/test/Transforms/InstCombine/call_nonnull_arg.ll deleted file mode 100644 index cac53d3..0000000 --- a/llvm/test/Transforms/InstCombine/call_nonnull_arg.ll +++ /dev/null @@ -1,17 +0,0 @@ -; RUN: opt < %s -instcombine -S | FileCheck %s - -; InstCombine should mark null-checked argument as nonnull at callsite -declare void @dummy(i32*) - -define void @test(i32* %a) { -; CHECK-LABEL: @test -; CHECK: call void @dummy(i32* nonnull %a) -entry: - %cond = icmp eq i32* %a, null - br i1 %cond, label %is_null, label %not_null -not_null: - call void @dummy(i32* %a) - ret void -is_null: - unreachable -} -- 2.7.4