parent
d78fc89fcb
commit
635d481de0
|
@ -1226,11 +1226,10 @@ GetAddrOfConstantCFString(const StringLiteral *Literal) {
|
||||||
str.assign(Literal->getStrData(), Literal->getByteLength());
|
str.assign(Literal->getStrData(), Literal->getByteLength());
|
||||||
StringLength = str.length();
|
StringLength = str.length();
|
||||||
}
|
}
|
||||||
llvm::StringMapEntry<llvm::Constant *> &Entry =
|
llvm::Constant *&Entry = CFConstantStringMap[str];
|
||||||
CFConstantStringMap.GetOrCreateValue(&str[0], &str[str.length()]);
|
|
||||||
|
|
||||||
if (llvm::Constant *C = Entry.getValue())
|
if (Entry)
|
||||||
return C;
|
return Entry;
|
||||||
|
|
||||||
llvm::Constant *Zero = getLLVMContext().getNullValue(llvm::Type::Int32Ty);
|
llvm::Constant *Zero = getLLVMContext().getNullValue(llvm::Type::Int32Ty);
|
||||||
llvm::Constant *Zeros[] = { Zero, Zero };
|
llvm::Constant *Zeros[] = { Zero, Zero };
|
||||||
|
@ -1320,7 +1319,7 @@ GetAddrOfConstantCFString(const StringLiteral *Literal) {
|
||||||
"_unnamed_cfstring_");
|
"_unnamed_cfstring_");
|
||||||
if (const char *Sect = getContext().Target.getCFStringSection())
|
if (const char *Sect = getContext().Target.getCFStringSection())
|
||||||
GV->setSection(Sect);
|
GV->setSection(Sect);
|
||||||
Entry.setValue(GV);
|
Entry = GV;
|
||||||
|
|
||||||
return GV;
|
return GV;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue