From c25c42f3ca3436d3b90e770d5488286043da956b Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 9 Dec 2007 23:49:42 +0000 Subject: [PATCH] Implement codegen support for: char text[8] = "string"; Big fixme remains. llvm-svn: 44750 --- clang/CodeGen/CodeGenModule.cpp | 21 +++++++++++++++++++++ clang/test/CodeGen/globalinit.c | 3 +++ 2 files changed, 24 insertions(+) diff --git a/clang/CodeGen/CodeGenModule.cpp b/clang/CodeGen/CodeGenModule.cpp index ecabb814ae76..55336510c637 100644 --- a/clang/CodeGen/CodeGenModule.cpp +++ b/clang/CodeGen/CodeGenModule.cpp @@ -407,6 +407,27 @@ static llvm::Constant *GenerateConstantExpr(const Expr *Expression, return llvm::ConstantExpr::getGetElementPtr(C, Ops, 2); } + // If this is an implicit cast of a string literal to an array type, this + // must be a string initializing an array. Don't emit it as the address of + // the string, emit the string data itself as an inline array. + if (const StringLiteral *String = + dyn_cast(ICExpr->getSubExpr())) + if (const ArrayType *AT = ICExpr->getType()->getAsArrayType()) { + // Verify that this is an array of char or wchar. Array of const char* + // can be initialized with a string literal, which does not expand the + // characters inline. + // FIXME: What about wchar_t?? + if (AT->getElementType()->isCharType()) { + const char *StrData = String->getStrData(); + unsigned Len = String->getByteLength(); + llvm::Constant *C = + llvm::ConstantArray::get(std::string(StrData, StrData + Len)); + // FIXME: This should return a string of the proper type: this + // mishandles things like 'char x[4] = "1234567"; + return C; + } + } + return GenerateConstantCast(ICExpr->getSubExpr(), type, CGM); } diff --git a/clang/test/CodeGen/globalinit.c b/clang/test/CodeGen/globalinit.c index bfa909bd7534..996d2acabb52 100644 --- a/clang/test/CodeGen/globalinit.c +++ b/clang/test/CodeGen/globalinit.c @@ -15,3 +15,6 @@ void *g = y; int latin_ptr2len (char *p); int (*mb_ptr2len) (char *p) = latin_ptr2len; + +char string[8] = "string"; +