Temporarily revert r175470 for more review.

llvm-svn: 175476

2 files changed, 0 insertions, 26 deletions

diff --git a/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp b/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
index 2f47174ea6c..cccf0a67a64 100644
--- a/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
+++ b/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
@@ -1889,9 +1889,6 @@ LibCallSimplifier::~LibCallSimplifier() {
 }
 
 Value *LibCallSimplifier::optimizeCall(CallInst *CI) {
-  Function *F = CI->getParent()->getParent();
-  // We don't want to "optimize" if the function doesn't want builtins.
-  if (F->hasFnAttribute("no-builtin")) return 0;
   return Impl->optimizeCall(CI);
 }
 
diff --git a/llvm/test/Transforms/InstCombine/no-builtin.ll b/llvm/test/Transforms/InstCombine/no-builtin.ll
deleted file mode 100644
index a576cd4813d..00000000000
--- a/llvm/test/Transforms/InstCombine/no-builtin.ll
+++ /dev/null
@@ -1,23 +0,0 @@
-; RUN: opt < %s -instcombine -S | FileCheck %s
-@.str = private unnamed_addr constant [14 x i8] c"hello world!\0A\00", align 1
-
-; CHECK: @foo
-; CHECK: printf
-define void @foo() nounwind ssp uwtable "no-builtin" {
-entry:
-  %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([14 x i8]* @.str, i32 0, i32 0))
-  ret void
-}
-
-; CHECK: @bar
-; CHECK: puts
-define void @bar() nounwind ssp uwtable {
-entry:
-  %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([14 x i8]* @.str, i32 0, i32 0))
-  ret void
-}
-
-declare i32 @printf(i8*, ...)
-
-attributes #0 = { nounwind ssp uwtable "no-builtin" }
-attributes #1 = { nounwind ssp uwtable }