r208426 - 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

[James Molloy]

Author: jamesm
Date: Fri May  9 11:28:56 2014
New Revision: 208426

URL: http://llvm.org/viewvc/llvm-project?rev=208426&view=rev
Log:
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

Modified:
    cfe/trunk/lib/CodeGen/CodeGenModule.cpp

Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=208426&r1=208425&r2=208426&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Fri May  9 11:28:56 2014
@@ -2670,7 +2670,7 @@ CodeGenModule::GetConstantArrayFromStrin
 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) {