nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch to fix IR-gen crash generating structure ABI which implements

Browse Source 
user specified string class via -fconstant-string-class option.
pr9914.

llvm-svn: 131496
This commit is contained in:
Fariborz Jahanian
2011-05-17 22:21:16 +00:00
parent 4298df6d86
commit 7bd3d1c49b
6 changed files with 59 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
clang/lib/CodeGen/CodeGenModule.cpp
View File

@@ -1768,24 +1768,31 @@ CodeGenModule::GetAddrOfConstantString(const StringLiteral *Literal) {
if (!ConstantStringClassRef) {
std::string StringClass(getLangOptions().ObjCConstantStringClass);
const llvm::Type *Ty = getTypes().ConvertType(getContext().IntTy);
Ty = llvm::ArrayType::get(Ty, 0);
llvm::Constant *GV;
if (StringClass.empty())
GV = CreateRuntimeVariable(Ty,
Features.ObjCNonFragileABI ?
"OBJC_CLASS_$_NSConstantString" :
"_NSConstantStringClassReference");
else {
if (Features.ObjCNonFragileABI) {
std::string str;
if (Features.ObjCNonFragileABI)
if (StringClass.empty())
str = "OBJC_CLASS_$_NSConstantString";
else {
str = "OBJC_CLASS_$_" + StringClass;
else
str = "_" + StringClass + "ClassReference";
GV = CreateRuntimeVariable(Ty, str);
}
GV = getObjCRuntime().GetClassGlobal(str);
// Make sure the result is of the correct type.
const llvm::Type *PTy = llvm::PointerType::getUnqual(Ty);
ConstantStringClassRef =
llvm::ConstantExpr::getBitCast(GV, PTy);
} else {
Ty = llvm::ArrayType::get(Ty, 0);
if (StringClass.empty())
GV = CreateRuntimeVariable(Ty, "_NSConstantStringClassReference");
else {
std::string str = "_" + StringClass + "ClassReference";
GV = CreateRuntimeVariable(Ty, str);
}
// Decay array -> ptr
ConstantStringClassRef =
llvm::ConstantExpr::getGetElementPtr(GV, Zeros, 2);
}
// Decay array -> ptr
ConstantStringClassRef =
llvm::ConstantExpr::getGetElementPtr(GV, Zeros, 2);
}
QualType NSTy = getContext().getNSConstantStringType();