Back out r54608 (inline string literals were getting an extra '\0')
temporarily, I assumed GetAddrForConstantString literal was being
used consistently but it doesn't look like it is.
Factored out a CodeGenModule::getStringForStringLiteral which handles
extracting a std::string for the bytes of a StringLiteral, padded to
match the type.
Update EmitLValue to use getStringForStringLiteral, this was
previously not padding strings correctly. Good thing we only emit
strings in 4 different places!
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@54621 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index 091001e..19ac711 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -492,19 +492,10 @@
}
LValue CodeGenFunction::EmitStringLiteralLValue(const StringLiteral *E) {
- assert(!E->isWide() && "FIXME: Wide strings not supported yet!");
- // Get the string data
- const char *StrData = E->getStrData();
- unsigned Len = E->getByteLength();
- std::string StringLiteral(StrData, StrData+Len);
+ llvm::Constant *C =
+ CGM.GetAddrOfConstantString(CGM.getStringForStringLiteral(E));
- // Resize the string to the right size
- const ConstantArrayType *CAT =
- getContext().getAsConstantArrayType(E->getType());
- uint64_t RealLen = CAT->getSize().getZExtValue();
- StringLiteral.resize(RealLen, '\0');
-
- return LValue::MakeAddr(CGM.GetAddrOfConstantString(StringLiteral),0);
+ return LValue::MakeAddr(C,0);
}
LValue CodeGenFunction::EmitPredefinedLValue(const PredefinedExpr *E) {