From df8a668e3f694abcbe55224050f2c2f242b24e1e Mon Sep 17 00:00:00 2001
From: Bill Wendling <isanbard@gmail.com>
Date: Tue, 19 Feb 2013 00:52:45 +0000
Subject: [PATCH] Temporarily revert r175470 for more review.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@175476 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Transforms/Utils/SimplifyLibCalls.cpp |  3 ---
 test/Transforms/InstCombine/no-builtin.ll | 23 -----------------------
 2 files changed, 26 deletions(-)
 delete mode 100644 test/Transforms/InstCombine/no-builtin.ll

diff --git a/lib/Transforms/Utils/SimplifyLibCalls.cpp b/lib/Transforms/Utils/SimplifyLibCalls.cpp
index 2f47174ea6c..cccf0a67a64 100644
--- a/lib/Transforms/Utils/SimplifyLibCalls.cpp
+++ b/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/test/Transforms/InstCombine/no-builtin.ll b/test/Transforms/InstCombine/no-builtin.ll
deleted file mode 100644
index a576cd4813d..00000000000
--- a/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 }
-- 
2.34.1