diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2017-03-24 14:15:35 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2017-03-24 14:15:35 +0000 |
| commit | 46f5e2c47b7bc58f30614a10d7b78deef3a784d1 (patch) | |
| tree | 7832e002053c5371e7559c3d2149c4a850892513 | |
| parent | c06d672a7a9f7332c8dba7bfca4e792bb2bd3c28 (diff) | |
| download | bcm5719-llvm-46f5e2c47b7bc58f30614a10d7b78deef3a784d1.tar.gz bcm5719-llvm-46f5e2c47b7bc58f30614a10d7b78deef3a784d1.zip | |
Make GCC happy again.
llvm-svn: 298702
| -rw-r--r-- | llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 3 | ||||
| -rw-r--r-- | llvm/utils/TableGen/X86EVEX2VEXTablesEmitter.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp index 1869741b342..7661b98a716 100644 --- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/llvm/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/llvm/utils/TableGen/X86EVEX2VEXTablesEmitter.cpp b/llvm/utils/TableGen/X86EVEX2VEXTablesEmitter.cpp index cfd08368233..d84f32ac92d 100644 --- a/llvm/utils/TableGen/X86EVEX2VEXTablesEmitter.cpp +++ b/llvm/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", |
