diff options
| author | James Molloy <james.molloy@arm.com> | 2014-05-09 16:17:09 +0000 |
|---|---|---|
| committer | James Molloy <james.molloy@arm.com> | 2014-05-09 16:17:09 +0000 |
| commit | 1aa0d5f3b276ddb57d4d2b213ff19e09d61d631c (patch) | |
| tree | 59a34e808bd80620045b89e3b466ba0069bb801d /clang/lib/CodeGen/CodeGenModule.cpp | |
| parent | fc13db477ae829a01dceaefb11052f86b08938e4 (diff) | |
| download | llvm-1aa0d5f3b276ddb57d4d2b213ff19e09d61d631c.zip llvm-1aa0d5f3b276ddb57d4d2b213ff19e09d61d631c.tar.gz llvm-1aa0d5f3b276ddb57d4d2b213ff19e09d61d631c.tar.bz2 | |
Revert r208417 (olista01 'ARM: HFAs must be passed in consecutive registers'). This is a followon commit from r208413 which broke the LLVM bots.
llvm-svn: 208422
Diffstat (limited to 'clang/lib/CodeGen/CodeGenModule.cpp')
| -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 d474c1b..bf639bf 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) { |