Make GCC happy again.

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

diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp
index 1869741b3423641a707e2ac80d1c30850c656096..7661b98a7169738511edcb723df7c1afc115f4f7 100644 (file)
--- a/lib/Transforms/Utils/SimplifyCFG.cpp
+++ b/lib/Transforms/Utils/SimplifyCFG.cpp
@@ -997,8 +997,7 @@ bool SimplifyCFGOpt::FoldValueComparisonIntoPredecessors(TerminatorInst *TI,
       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;
         }
       }

diff --git a/utils/TableGen/X86EVEX2VEXTablesEmitter.cpp b/utils/TableGen/X86EVEX2VEXTablesEmitter.cpp
index cfd08368233d309b7dffbce5fa6340e1d14fdda4..d84f32ac92de517b9c35a4e51c0939057e8edb11 100644 (file)
--- a/utils/TableGen/X86EVEX2VEXTablesEmitter.cpp
+++ b/utils/TableGen/X86EVEX2VEXTablesEmitter.cpp
@@ -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",