Make the constant folder aware of 
__builtin___CFStringMakeConstantString.  (We get into trouble in 
GenerateStaticBlockVarDecl if the constant folder isn't accurate.)



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62949 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp
index 30f8c34..9260b11 100644
--- a/lib/CodeGen/CGBuiltin.cpp
+++ b/lib/CodeGen/CGBuiltin.cpp
@@ -42,8 +42,8 @@
   if (E->Evaluate(Result, CGM.getContext())) {
     if (Result.Val.isInt())
       return RValue::get(llvm::ConstantInt::get(Result.Val.getInt()));
-    assert(Result.Val.isFloat() && "Unsupported constant type");
-    return RValue::get(llvm::ConstantFP::get(Result.Val.getFloat()));
+    else if (Result.Val.isFloat())
+      return RValue::get(llvm::ConstantFP::get(Result.Val.getFloat()));
   }
       
   switch (BuiltinID) {