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 | deba5fb0e7bc83b3d5b73e7eaf24083f2da8c286 (patch) | |
| tree | 5411a0b770c89d17864cfbf037cae7dec72ac512 /lib/CodeGen/CodeGenModule.cpp | |
| parent | fd754157c9567390f724a496fe87103b321074a8 (diff) | |
| download | clang-deba5fb0e7bc83b3d5b73e7eaf24083f2da8c286.tar.gz clang-deba5fb0e7bc83b3d5b73e7eaf24083f2da8c286.tar.bz2 clang-deba5fb0e7bc83b3d5b73e7eaf24083f2da8c286.tar.xz | |
Revert r208417 (olista01 'ARM: HFAs must be passed in consecutive registers'). This is a followon commit from r208413 which broke the LLVM bots.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@208422 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CodeGenModule.cpp')
| -rw-r--r-- | lib/CodeGen/CodeGenModule.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index d474c1b464..bf639bf045 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/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) { |