diff options
| author | James Molloy <james.molloy@arm.com> | 2014-05-09 16:28:56 +0000 |
|---|---|---|
| committer | James Molloy <james.molloy@arm.com> | 2014-05-09 16:28:56 +0000 |
| commit | e735b2bae39c2ec4aef11802d133034e6a15f6d0 (patch) | |
| tree | ff08b55eb9b3e6d44ae735d2e47d0f4cf7693e14 /clang/lib | |
| parent | 6f244b6f784e55ee6c404f059c5fc6bfe2c288eb (diff) | |
| download | bcm5719-llvm-e735b2bae39c2ec4aef11802d133034e6a15f6d0.tar.gz bcm5719-llvm-e735b2bae39c2ec4aef11802d133034e6a15f6d0.zip | |
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
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/CodeGen/CodeGenModule.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index bf639bf0458..d474c1b464f 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -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) { |
