Pacify bots again - turns out my checkout was slightly polluted when I was reverting...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@208426 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index bf639bf0458e4d42134c0c9849192720d86e5600..d474c1b464fabeb642c7b1fd1b558b8613d1da3f 100644 (file)
--- 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) {