From: James Molloy <james.molloy@arm.com>
Date: Fri, 9 May 2014 16:28:56 +0000 (+0000)
Subject: Pacify bots again - turns out my checkout was slightly polluted when I was reverting... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60f8d9482519e71159b6c28ddb1503ce26d0c194;p=clang

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

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 bf639bf045..d474c1b464 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) {