Try harder to fix bugpoint with GCC5

This commit is contained in:
Benjamin Kramer 2020-01-29 03:30:05 +01:00
parent f96f64d0f2
commit 42a25e7fe6
2 changed files with 6 additions and 3 deletions

View File

@ -607,7 +607,8 @@ bool ReduceCrashingConditionals::TestBlocks(
std::vector<std::pair<std::string, std::string>> BlockInfo;
for (const BasicBlock *BB : Blocks)
BlockInfo.emplace_back(BB->getParent()->getName(), BB->getName());
BlockInfo.emplace_back(std::string(BB->getParent()->getName()),
BB->getName());
SmallVector<BasicBlock *, 16> ToProcess;
for (auto &F : *M) {
@ -697,7 +698,8 @@ bool ReduceSimplifyCFG::TestBlocks(std::vector<const BasicBlock *> &BBs) {
std::vector<std::pair<std::string, std::string>> BlockInfo;
for (const BasicBlock *BB : Blocks)
BlockInfo.emplace_back(BB->getParent()->getName(), BB->getName());
BlockInfo.emplace_back(std::string(BB->getParent()->getName()),
BB->getName());
// Loop over and delete any hack up any blocks that are not listed...
for (auto &F : *M)

View File

@ -588,7 +588,8 @@ ExtractBlocks(BugDriver &BD,
for (Module::iterator I = Extracted->begin(), E = Extracted->end(); I != E;
++I)
if (!I->isDeclaration())
MisCompFunctions.emplace_back(I->getName(), I->getFunctionType());
MisCompFunctions.emplace_back(std::string(I->getName()),
I->getFunctionType());
if (Linker::linkModules(*ProgClone, std::move(Extracted)))
exit(1);