[llvm] r298702 - Make GCC happy again.

[Benjamin Kramer via llvm-commits]

Author: d0k
Date: Fri Mar 24 09:15:35 2017
New Revision: 298702

URL: http://llvm.org/viewvc/llvm-project?rev=298702&view=rev
Log:
Make GCC happy again.

Modified:
    llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp
    llvm/trunk/utils/TableGen/X86EVEX2VEXTablesEmitter.cpp

Modified: llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp?rev=298702&r1=298701&r2=298702&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp Fri Mar 24 09:15:35 2017
@@ -997,8 +997,7 @@ bool SimplifyCFGOpt::FoldValueComparison
       SmallSetVector<BasicBlock*, 4> FailBlocks;
       if (!SafeToMergeTerminators(TI, PTI, &FailBlocks)) {
         for (auto *Succ : FailBlocks) {
-          std::vector<BasicBlock*> Blocks = { TI->getParent() };
-          if (!SplitBlockPredecessors(Succ, Blocks, ".fold.split"))
+          if (!SplitBlockPredecessors(Succ, TI->getParent(), ".fold.split"))
             return false;
         }
       }

Modified: llvm/trunk/utils/TableGen/X86EVEX2VEXTablesEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/X86EVEX2VEXTablesEmitter.cpp?rev=298702&r1=298701&r2=298702&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/X86EVEX2VEXTablesEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/X86EVEX2VEXTablesEmitter.cpp Fri Mar 24 09:15:35 2017
@@ -57,7 +57,7 @@ private:
   bool inExceptionList(const CodeGenInstruction *Inst) {
     // List of EVEX instructions that match VEX instructions by the encoding
     // but do not perform the same operation.
-    static constexpr StringLiteral ExceptionList[] = {
+    static constexpr const char *ExceptionList[] = {
         "VCVTQQ2PD",
         "VCVTQQ2PS",
         "VPMAXSQ",