From 3941b18b8e441c8c466efecd557de60b9a32d10b Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Sun, 25 Jan 2009 01:54:01 +0000 Subject: [PATCH] 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 --- lib/AST/ExprConstant.cpp | 7 +++++++ lib/CodeGen/CGBuiltin.cpp | 4 ++-- lib/CodeGen/CGExprConstant.cpp | 9 +++++++++ test/CodeGen/cfstring.c | 4 +++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp index 76bdaa2c8f..43b45612b9 100644 --- a/lib/AST/ExprConstant.cpp +++ b/lib/AST/ExprConstant.cpp @@ -217,6 +217,7 @@ public: { 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 @@ APValue PointerExprEvaluator::VisitCastExpr(const CastExpr* E) { 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)) diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp index 30f8c34c58..9260b11ed3 100644 --- a/lib/CodeGen/CGBuiltin.cpp +++ b/lib/CodeGen/CGBuiltin.cpp @@ -42,8 +42,8 @@ RValue CodeGenFunction::EmitBuiltinExpr(unsigned BuiltinID, const CallExpr *E) { 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) { diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp index 0e31cacd1b..716e295f3e 100644 --- a/lib/CodeGen/CGExprConstant.cpp +++ b/lib/CodeGen/CGExprConstant.cpp @@ -625,6 +625,15 @@ public: llvm::Constant *C = llvm::ConstantInt::get(llvm::Type::Int32Ty, id); return llvm::ConstantExpr::getIntToPtr(C, ConvertType(E->getType())); } + case Expr::CallExprClass: { + CallExpr* CE = cast(E); + if (CE->isBuiltinCall() != Builtin::BI__builtin___CFStringMakeConstantString) + break; + const Expr *Arg = CE->getArg(0)->IgnoreParenCasts(); + const StringLiteral *Literal = cast(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())); diff --git a/test/CodeGen/cfstring.c b/test/CodeGen/cfstring.c index 7d7edeca3c..3bd1a2d183 100644 --- a/test/CodeGen/cfstring.c +++ b/test/CodeGen/cfstring.c @@ -8,4 +8,6 @@ void f() { // rdar://6248329 void *G = CFSTR("yo joe"); - +void h() { + static void* h = CFSTR("Goodbye, World!"); +} -- 2.40.0