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

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) {