Pacify bots again - turns out my checkout was slightly polluted when I was reverting a olista01s change, and this pollution made it upstream during the revert checkin :/ Sorryemacs -nw lib/CodeGen/CodeGenModule.cpp

llvm-svn: 208426
This commit is contained in:
James Molloy 2014-05-09 16:28:56 +00:00
parent 6f244b6f78
commit e735b2bae3
1 changed files with 1 additions and 1 deletions

View File

@ -2670,7 +2670,7 @@ CodeGenModule::GetConstantArrayFromStringLiteral(const StringLiteral *E) {
llvm::Constant *
CodeGenModule::GetAddrOfConstantStringFromLiteral(const StringLiteral *S) {
CharUnits Align = getContext().getAlignOfGlobalVarInChars(S->getType());
Align = std::max(Align, getContext().);
llvm::StringMapEntry<llvm::GlobalVariable *> *Entry = nullptr;
llvm::GlobalVariable *GV = nullptr;
if (!LangOpts.WritableStrings) {