[cfe-commits] r147677 - in /cfe/trunk: lib/CodeGen/CGBuiltin.cpp test/CodeGen/no-builtin.c

[Eli Friedman]

Author: efriedma
Date: Fri Jan  6 14:03:09 2012
New Revision: 147677

URL: http://llvm.org/viewvc/llvm-project?rev=147677&view=rev
Log:
Revert r147655; it's breaking the compiler_rt build on OSX.


Removed:
    cfe/trunk/test/CodeGen/no-builtin.c
Modified:
    cfe/trunk/lib/CodeGen/CGBuiltin.cpp

Modified: cfe/trunk/lib/CodeGen/CGBuiltin.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGBuiltin.cpp?rev=147677&r1=147676&r2=147677&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGBuiltin.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGBuiltin.cpp Fri Jan  6 14:03:09 2012
@@ -175,8 +175,7 @@
                                         unsigned BuiltinID, const CallExpr *E) {
   // See if we can constant fold this builtin.  If so, don't emit it at all.
   Expr::EvalResult Result;
-  if (!getContext().getLangOptions().NoBuiltin &&
-      E->EvaluateAsRValue(Result, CGM.getContext()) &&
+  if (E->EvaluateAsRValue(Result, CGM.getContext()) &&
       !Result.hasSideEffects()) {
     if (Result.Val.isInt())
       return RValue::get(llvm::ConstantInt::get(getLLVMContext(),

Removed: cfe/trunk/test/CodeGen/no-builtin.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/no-builtin.c?rev=147676&view=auto
==============================================================================
--- cfe/trunk/test/CodeGen/no-builtin.c (original)
+++ cfe/trunk/test/CodeGen/no-builtin.c (removed)
@@ -1,20 +0,0 @@
-// RUN: %clang_cc1 -fno-builtin -emit-llvm %s -o - | FileCheck %s
-//
-// Check that -fno-builtin prevents us from constant-folding through builtins
-// (PR11711)
-
-double
-cos(double x)
-{
-  printf("ok\n");
-  exit(0);
-}
-
-int
-main(int argc, char *argv[])
-{
-  cos(1); // CHECK: cos
-  printf("not ok\n");
-  abort();
-}
-