This wasn't such a good idea after all as it broke some tests.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@60582 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index 28440f40f51ebd6bba25ed77bf4b34f18040e7f5..9eeaa868a59e297a27f86e4610e360d996007898 100644 (file)
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -207,7 +207,6 @@ public:
 
   APValue VisitBinaryOperator(const BinaryOperator *E);
   APValue VisitCastExpr(const CastExpr* E);
-  APValue VisitCallExpr(CallExpr *E);
   APValue VisitUnaryOperator(const UnaryOperator *E);
   APValue VisitObjCStringLiteral(ObjCStringLiteral *E)
       { return APValue(E, 0); }
@@ -267,6 +266,7 @@ APValue PointerExprEvaluator::VisitUnaryOperator(const UnaryOperator *E) {
 
   return APValue();
 }
+  
 
 APValue PointerExprEvaluator::VisitCastExpr(const CastExpr* E) {
   const Expr* SubExpr = E->getSubExpr();
@@ -299,15 +299,6 @@ APValue PointerExprEvaluator::VisitCastExpr(const CastExpr* E) {
   return APValue();
 }  
 
-APValue PointerExprEvaluator::VisitCallExpr(CallExpr *E)
-{
-  switch (E->isBuiltinCall()) {
-    default: return APValue();
-    case Builtin::BI__builtin___CFStringMakeConstantString:
-      return APValue(E, 0);
-  }
-}
-
 APValue PointerExprEvaluator::VisitConditionalOperator(ConditionalOperator *E) {
   bool BoolResult;
   if (!HandleConversionToBool(E->getCond(), BoolResult, Info))