From 4e04a535d8f836804d39e8861ae17d7817293c5a Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Sat, 30 Jan 2021 12:19:14 -0800 Subject: [PATCH] [TableGen] Avoid a couple vector copies in ExpandHwModeBasedTypes. Use vector::swap instead of copying to a local vector and clearing the original. We can just swap into the just created local vector instead which will move the pointers and not the data. Use std::move in another place to avoid a copy. --- llvm/utils/TableGen/CodeGenDAGPatterns.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/llvm/utils/TableGen/CodeGenDAGPatterns.cpp b/llvm/utils/TableGen/CodeGenDAGPatterns.cpp index 1ca4a68..d4409db 100644 --- a/llvm/utils/TableGen/CodeGenDAGPatterns.cpp +++ b/llvm/utils/TableGen/CodeGenDAGPatterns.cpp @@ -4282,8 +4282,8 @@ static void collectModes(std::set &Modes, const TreePatternNode *N) { void CodeGenDAGPatterns::ExpandHwModeBasedTypes() { const CodeGenHwModes &CGH = getTargetInfo().getHwModes(); std::map> ModeChecks; - std::vector Copy = PatternsToMatch; - PatternsToMatch.clear(); + std::vector Copy; + PatternsToMatch.swap(Copy); auto AppendPattern = [this, &ModeChecks](PatternToMatch &P, unsigned Mode) { TreePatternNodePtr NewSrc = P.SrcPattern->clone(); @@ -4295,8 +4295,9 @@ void CodeGenDAGPatterns::ExpandHwModeBasedTypes() { std::vector Preds = P.Predicates; const std::vector &MC = ModeChecks[Mode]; llvm::append_range(Preds, MC); - PatternsToMatch.emplace_back(P.getSrcRecord(), Preds, std::move(NewSrc), - std::move(NewDst), P.getDstRegs(), + PatternsToMatch.emplace_back(P.getSrcRecord(), std::move(Preds), + std::move(NewSrc), std::move(NewDst), + P.getDstRegs(), P.getAddedComplexity(), Record::getNewUID(), Mode); }; -- 2.7.4