From 171c5fd43ecf46d5798b402c8cafccab07060e10 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Sat, 2 Jan 2021 09:24:15 -0800 Subject: [PATCH] [llvm] Use llvm::erase_value and llvm::erase_if (NFC) --- llvm/lib/CodeGen/WinEHPrepare.cpp | 8 ++------ llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp | 2 +- .../yaml-numeric-parser-fuzzer.cpp | 2 +- llvm/tools/llvm-yaml-parser-fuzzer/yaml-parser-fuzzer.cpp | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/llvm/lib/CodeGen/WinEHPrepare.cpp b/llvm/lib/CodeGen/WinEHPrepare.cpp index 5a25234..96d256b 100644 --- a/llvm/lib/CodeGen/WinEHPrepare.cpp +++ b/llvm/lib/CodeGen/WinEHPrepare.cpp @@ -804,13 +804,9 @@ void WinEHPrepare::cloneCommonBlocks(Function &F) { << "\' to block \'" << NewBlock->getName() << "\'.\n"); - BlocksInFunclet.erase( - std::remove(BlocksInFunclet.begin(), BlocksInFunclet.end(), OldBlock), - BlocksInFunclet.end()); + llvm::erase_value(BlocksInFunclet, OldBlock); ColorVector &OldColors = BlockColors[OldBlock]; - OldColors.erase( - std::remove(OldColors.begin(), OldColors.end(), FuncletPadBB), - OldColors.end()); + llvm::erase_value(OldColors, FuncletPadBB); DEBUG_WITH_TYPE("winehprepare-coloring", dbgs() << " Removed color \'" << FuncletPadBB->getName() diff --git a/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp b/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp index 39945ac..b6763fd 100644 --- a/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp +++ b/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp @@ -997,7 +997,7 @@ OperandMatchResultTy HexagonAsmParser::tryParseRegister(unsigned &RegNo, NeededWorkaround = NeededWorkaround || (Again && !(Contigious && Type)); } std::string Collapsed = std::string(RawString); - Collapsed.erase(llvm::remove_if(Collapsed, isSpace), Collapsed.end()); + llvm::erase_if(Collapsed, isSpace); StringRef FullString = Collapsed; std::pair DotSplit = FullString.split('.'); unsigned DotReg = matchRegister(DotSplit.first.lower()); diff --git a/llvm/tools/llvm-yaml-numeric-parser-fuzzer/yaml-numeric-parser-fuzzer.cpp b/llvm/tools/llvm-yaml-numeric-parser-fuzzer/yaml-numeric-parser-fuzzer.cpp index 3f50d60..7ffc75e 100644 --- a/llvm/tools/llvm-yaml-numeric-parser-fuzzer/yaml-numeric-parser-fuzzer.cpp +++ b/llvm/tools/llvm-yaml-numeric-parser-fuzzer/yaml-numeric-parser-fuzzer.cpp @@ -39,7 +39,7 @@ inline bool isNumericRegex(llvm::StringRef S) { extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { std::string Input(reinterpret_cast(Data), Size); - Input.erase(std::remove(Input.begin(), Input.end(), 0), Input.end()); + llvm::erase_value(Input, 0); if (!Input.empty() && llvm::yaml::isNumeric(Input) != isNumericRegex(Input)) LLVM_BUILTIN_TRAP; return 0; diff --git a/llvm/tools/llvm-yaml-parser-fuzzer/yaml-parser-fuzzer.cpp b/llvm/tools/llvm-yaml-parser-fuzzer/yaml-parser-fuzzer.cpp index 3aeaf02..007769f 100644 --- a/llvm/tools/llvm-yaml-parser-fuzzer/yaml-parser-fuzzer.cpp +++ b/llvm/tools/llvm-yaml-parser-fuzzer/yaml-parser-fuzzer.cpp @@ -25,7 +25,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { isValidYaml(Input.data(), Input.size()); // Ensure we don't crash on byte strings with no null characters. - Input.erase(std::remove(Input.begin(), Input.end(), 0), Input.end()); + llvm::erase_value(Input, 0); Input.shrink_to_fit(); bool IsValidWithout0s = isValidYaml(Input.data(), Input.size()); -- 2.7.4