From: Benjamin Kramer <benny.kra@googlemail.com>
Date: Fri, 24 Mar 2017 14:15:35 +0000 (+0000)
Subject: Make GCC happy again.
X-Git-Tag: android-x86-7.1-r4~18537
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1dd3d84b8026131b4a102a2c09c6b3c5ebc09484;p=android-x86%2Fexternal-llvm.git

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 1869741b342..7661b98a716 100644
--- 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 cfd08368233..d84f32ac92d 100644
--- 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",