[llvm] r360164 - Avoid use-after-move warnings by using swap instead. NFCI.
Simon Pilgrim via llvm-commits
llvm-commits at lists.llvm.org
Tue May 7 08:45:00 PDT 2019
Author: rksimon
Date: Tue May 7 08:45:00 2019
New Revision: 360164
URL: http://llvm.org/viewvc/llvm-project?rev=360164&view=rev
Log:
Avoid use-after-move warnings by using swap instead. NFCI.
Swap should be as quick in these cases, and leaves the original variables in a known (empty) state.
Modified:
llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.cpp
llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
Modified: llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.cpp?rev=360164&r1=360163&r2=360164&view=diff
==============================================================================
--- llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.cpp (original)
+++ llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.cpp Tue May 7 08:45:00 2019
@@ -749,7 +749,8 @@ void ValueEnumerator::organizeMetadata()
// Rebuild MDs, index the metadata ranges for each function in FunctionMDs,
// and fix up MetadataMap.
- std::vector<const Metadata *> OldMDs = std::move(MDs);
+ std::vector<const Metadata *> OldMDs;
+ MDs.swap(OldMDs);
MDs.reserve(OldMDs.size());
for (unsigned I = 0, E = Order.size(); I != E && !Order[I].F; ++I) {
auto *MD = Order[I].get(OldMDs);
Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=360164&r1=360163&r2=360164&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Tue May 7 08:45:00 2019
@@ -8858,8 +8858,11 @@ TargetLowering::LowerCallTo(TargetLoweri
if (CLI.IsPostTypeLegalization) {
// If we are lowering a libcall after legalization, split the return type.
- SmallVector<EVT, 4> OldRetTys = std::move(RetTys);
- SmallVector<uint64_t, 4> OldOffsets = std::move(Offsets);
+ SmallVector<EVT, 4> OldRetTys;
+ SmallVector<uint64_t, 4> OldOffsets;
+ RetTys.swap(OldRetTys);
+ Offsets.swap(OldOffsets);
+
for (size_t i = 0, e = OldRetTys.size(); i != e; ++i) {
EVT RetVT = OldRetTys[i];
uint64_t Offset = OldOffsets[i];
More information about the llvm-commits
mailing list