[cfe-commits] r62949 - in /cfe/trunk: lib/AST/ExprConstant.cpp lib/CodeGen/CGBuiltin.cpp lib/CodeGen/CGExprConstant.cpp test/CodeGen/cfstring.c

[Eli Friedman]

Author: efriedma
Date: Sat Jan 24 19:54:01 2009
New Revision: 62949

URL: http://llvm.org/viewvc/llvm-project?rev=62949&view=rev
Log:
Make the constant folder aware of 
__builtin___CFStringMakeConstantString.  (We get into trouble in 
GenerateStaticBlockVarDecl if the constant folder isn't accurate.)


Modified:
    cfe/trunk/lib/AST/ExprConstant.cpp
    cfe/trunk/lib/CodeGen/CGBuiltin.cpp
    cfe/trunk/lib/CodeGen/CGExprConstant.cpp
    cfe/trunk/test/CodeGen/cfstring.c

Modified: cfe/trunk/lib/AST/ExprConstant.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ExprConstant.cpp?rev=62949&r1=62948&r2=62949&view=diff

==============================================================================
--- cfe/trunk/lib/AST/ExprConstant.cpp (original)
+++ cfe/trunk/lib/AST/ExprConstant.cpp Sat Jan 24 19:54:01 2009
@@ -217,6 +217,7 @@
       { return APValue(E, 0); }
   APValue VisitAddrLabelExpr(AddrLabelExpr *E)
       { return APValue(E, 0); }
+  APValue VisitCallExpr(CallExpr *E);
   APValue VisitConditionalOperator(ConditionalOperator *E);
 };
 } // end anonymous namespace
@@ -306,6 +307,12 @@
   return APValue();
 }  
 
+APValue PointerExprEvaluator::VisitCallExpr(CallExpr *E) {
+  if (E->isBuiltinCall() == Builtin::BI__builtin___CFStringMakeConstantString)
+    return APValue(E, 0);
+  return APValue();
+}
+
 APValue PointerExprEvaluator::VisitConditionalOperator(ConditionalOperator *E) {
   bool BoolResult;
   if (!HandleConversionToBool(E->getCond(), BoolResult, Info))

Modified: cfe/trunk/lib/CodeGen/CGBuiltin.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGBuiltin.cpp?rev=62949&r1=62948&r2=62949&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGBuiltin.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGBuiltin.cpp Sat Jan 24 19:54:01 2009
@@ -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) {

Modified: cfe/trunk/lib/CodeGen/CGExprConstant.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprConstant.cpp?rev=62949&r1=62948&r2=62949&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGExprConstant.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExprConstant.cpp Sat Jan 24 19:54:01 2009
@@ -625,6 +625,15 @@
       llvm::Constant *C = llvm::ConstantInt::get(llvm::Type::Int32Ty, id);
       return llvm::ConstantExpr::getIntToPtr(C, ConvertType(E->getType()));
     }
+    case Expr::CallExprClass: {
+      CallExpr* CE = cast<CallExpr>(E);
+      if (CE->isBuiltinCall() != Builtin::BI__builtin___CFStringMakeConstantString)
+        break;
+      const Expr *Arg = CE->getArg(0)->IgnoreParenCasts();
+      const StringLiteral *Literal = cast<StringLiteral>(Arg);
+      std::string S(Literal->getStrData(), Literal->getByteLength());
+      return CGM.GetAddrOfConstantCFString(S);
+    }
     }
     CGM.ErrorUnsupported(E, "constant l-value expression");
     llvm::Type *Ty = llvm::PointerType::getUnqual(ConvertType(E->getType()));

Modified: cfe/trunk/test/CodeGen/cfstring.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/cfstring.c?rev=62949&r1=62948&r2=62949&view=diff

==============================================================================
--- cfe/trunk/test/CodeGen/cfstring.c (original)
+++ cfe/trunk/test/CodeGen/cfstring.c Sat Jan 24 19:54:01 2009
@@ -8,4 +8,6 @@
 // rdar://6248329
 void *G = CFSTR("yo joe");
 
-
+void h() {
+  static void* h = CFSTR("Goodbye, World!");
+}