Make GCC happy again.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@298702 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Benjamin Kramer 2017-03-24 14:15:35 +00:00
parent 54c10c042d
commit 1dd3d84b80
2 changed files with 2 additions and 3 deletions

View File

@ -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;
}
}

View File

@ -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",