Skip to content

Commit 01e1627

Browse files
fanquakefanquake
committed
Merge bitcoin/bitcoin#25872: Fix issues when calling std::move(const&)
fa87534 Fix iwyu (MacroFake) faad673 Fix issues when calling std::move(const&) (MacroFake) Pull request description: Passing a symbol to `std::move` that is marked `const` is a no-op, which can be fixed in two ways: * Remove the `const`, or * Remove the `std::move` ACKs for top commit: ryanofsky: Code review ACK fa87534. Looks good. Good for univalue to support c++11 move optimizations Tree-SHA512: 3dc5cad55b93cfa311abedfb811f35fc1b7f30a1c68561f15942438916c7de25e179c364be11881e01f844f9c2ccd71a3be55967ad5abd2f35b10bb7a882edea
2 parents d16ef40 + fa87534 commit 01e1627

File tree

15 files changed

+28
-27
lines changed

15 files changed

+28
-27
lines changed

‎ci/test/06_script_b.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ if [ "${RUN_TIDY}" = "true" ]; then
6565
" src/util/serfloat.cpp"\
6666
" src/util/spanparsing.cpp"\
6767
" src/util/strencodings.cpp"\
68+
" src/util/string.cpp"\
6869
" src/util/syserror.cpp"\
6970
" src/util/url.cpp"\
7071
" -p . ${MAKEJOBS} -- -Xiwyu --cxx17ns -Xiwyu --mapping_file=${BASE_BUILD_DIR}/bitcoin-$HOST/contrib/devtools/iwyu/bitcoin.core.imp"

‎src/.clang-tidy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ misc-unused-using-decls,
66
modernize-use-default-member-init,
77
modernize-use-nullptr,
88
performance-for-range-copy,
9+
performance-move-const-arg,
910
performance-unnecessary-copy-initialization,
1011
readability-redundant-declaration,
1112
readability-redundant-string-init,
@@ -17,7 +18,11 @@ misc-unused-using-decls,
1718
modernize-use-default-member-init,
1819
modernize-use-nullptr,
1920
performance-for-range-copy,
21+
performance-move-const-arg,
2022
performance-unnecessary-copy-initialization,
2123
readability-redundant-declaration,
2224
readability-redundant-string-init,
2325
'
26+
CheckOptions:
27+
- key: performance-move-const-arg.CheckTriviallyCopyableMove
28+
value: false

‎src/node/mempool_args.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <logging.h>
1313
#include <policy/feerate.h>
1414
#include <policy/policy.h>
15+
#include <script/standard.h>
1516
#include <tinyformat.h>
1617
#include <util/error.h>
1718
#include <util/moneystr.h>

‎src/rpc/blockchain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2129,7 +2129,7 @@ static RPCHelpMan scantxoutset()
21292129
for (const UniValue& scanobject : request.params[1].get_array().getValues()) {
21302130
FlatSigningProvider provider;
21312131
auto scripts = EvalDescriptorStringOrObject(scanobject, provider);
2132-
for (const auto& script : scripts) {
2132+
for (CScript& script : scripts) {
21332133
std::string inferred = InferDescriptor(script, provider)->ToString();
21342134
needles.emplace(script);
21352135
descriptors.emplace(std::move(script), std::move(inferred));

‎src/script/descriptor.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ class DescriptorImpl : public Descriptor
572572
if (pos++) ret += ",";
573573
std::string tmp;
574574
if (!scriptarg->ToStringHelper(arg, tmp, type, cache)) return false;
575-
ret += std::move(tmp);
575+
ret += tmp;
576576
}
577577
return true;
578578
}
@@ -596,7 +596,7 @@ class DescriptorImpl : public Descriptor
596596
tmp = pubkey->ToString();
597597
break;
598598
}
599-
ret += std::move(tmp);
599+
ret += tmp;
600600
}
601601
std::string subscript;
602602
if (!ToStringSubScriptHelper(arg, subscript, type, cache)) return false;
@@ -912,7 +912,7 @@ class TRDescriptor final : public DescriptorImpl
912912
}
913913
std::string tmp;
914914
if (!m_subdescriptor_args[pos]->ToStringHelper(arg, tmp, type, cache)) return false;
915-
ret += std::move(tmp);
915+
ret += tmp;
916916
while (!path.empty() && path.back()) {
917917
if (path.size() > 1) ret += '}';
918918
path.pop_back();

‎src/test/fuzz/txorphan.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <util/check.h>
2020
#include <util/time.h>
2121

22-
#include <algorithm>
2322
#include <cstdint>
2423
#include <memory>
2524
#include <set>

‎src/threadinterrupt.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#define BITCOIN_THREADINTERRUPT_H
77

88
#include <sync.h>
9+
#include <threadsafety.h>
910

1011
#include <atomic>
1112
#include <chrono>

‎src/univalue/include/univalue.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@ class UniValue {
8080
bool isArray() const { return (typ == VARR); }
8181
bool isObject() const { return (typ == VOBJ); }
8282

83-
void push_back(const UniValue& val);
83+
void push_back(UniValue val);
8484
void push_backV(const std::vector<UniValue>& vec);
8585
template <class It>
8686
void push_backV(It first, It last);
8787

88-
void __pushKV(const std::string& key, const UniValue& val);
89-
void pushKV(const std::string& key, const UniValue& val);
90-
void pushKVs(const UniValue& obj);
88+
void __pushKV(std::string key, UniValue val);
89+
void pushKV(std::string key, UniValue val);
90+
void pushKVs(UniValue obj);
9191

9292
std::string write(unsigned int prettyIndent = 0,
9393
unsigned int indentLevel = 0) const;

‎src/univalue/lib/univalue.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@ void UniValue::setObject()
101101
typ = VOBJ;
102102
}
103103

104-
void UniValue::push_back(const UniValue& val_)
104+
void UniValue::push_back(UniValue val)
105105
{
106106
checkType(VARR);
107107

108-
values.push_back(val_);
108+
values.push_back(std::move(val));
109109
}
110110

111111
void UniValue::push_backV(const std::vector<UniValue>& vec)
@@ -115,32 +115,32 @@ void UniValue::push_backV(const std::vector<UniValue>& vec)
115115
values.insert(values.end(), vec.begin(), vec.end());
116116
}
117117

118-
void UniValue::__pushKV(const std::string& key, const UniValue& val_)
118+
void UniValue::__pushKV(std::string key, UniValue val)
119119
{
120120
checkType(VOBJ);
121121

122-
keys.push_back(key);
123-
values.push_back(val_);
122+
keys.push_back(std::move(key));
123+
values.push_back(std::move(val));
124124
}
125125

126-
void UniValue::pushKV(const std::string& key, const UniValue& val_)
126+
void UniValue::pushKV(std::string key, UniValue val)
127127
{
128128
checkType(VOBJ);
129129

130130
size_t idx;
131131
if (findKey(key, idx))
132-
values[idx] = val_;
132+
values[idx] = std::move(val);
133133
else
134-
__pushKV(key, val_);
134+
__pushKV(std::move(key), std::move(val));
135135
}
136136

137-
void UniValue::pushKVs(const UniValue& obj)
137+
void UniValue::pushKVs(UniValue obj)
138138
{
139139
checkType(VOBJ);
140140
obj.checkType(VOBJ);
141141

142142
for (size_t i = 0; i < obj.keys.size(); i++)
143-
__pushKV(obj.keys[i], obj.values.at(i));
143+
__pushKV(std::move(obj.keys.at(i)), std::move(obj.values.at(i)));
144144
}
145145

146146
void UniValue::getObjMap(std::map<std::string,UniValue>& kv) const

‎src/util/bip32.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66
#include <util/bip32.h>
77
#include <util/strencodings.h>
88

9-
#include <algorithm>
109
#include <cstdint>
1110
#include <cstdio>
1211
#include <sstream>
1312

14-
1513
bool ParseHDKeypath(const std::string& keypath_str, std::vector<uint32_t>& keypath)
1614
{
1715
std::stringstream ss(keypath_str);

‎src/util/message.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include <key_io.h>
99
#include <pubkey.h>
1010
#include <script/standard.h>
11-
#include <serialize.h>
1211
#include <uint256.h>
1312
#include <util/message.h>
1413
#include <util/strencodings.h>

‎src/util/strencodings.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include <span.h>
77
#include <util/strencodings.h>
88

9-
#include <algorithm>
109
#include <array>
1110
#include <cassert>
1211
#include <cstring>

‎src/util/string.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66

77
#include <regex>
88
#include <string>
9-
#include <utility>
109

1110
void ReplaceAll(std::string& in_out, const std::string& search, const std::string& substitute)
1211
{
1312
if (search.empty()) return;
14-
in_out = std::regex_replace(in_out, std::regex(std::move(search)), substitute);
13+
in_out = std::regex_replace(in_out, std::regex(search), substitute);
1514
}

‎src/util/string.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
#include <util/spanparsing.h>
99

10-
#include <algorithm>
1110
#include <array>
1211
#include <cstdint>
1312
#include <cstring>

‎src/wallet/spend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ std::map<CTxDestination, std::vector<COutput>> ListCoins(const CWallet& wallet)
353353

354354
std::map<CTxDestination, std::vector<COutput>> result;
355355

356-
for (const COutput& coin : AvailableCoinsListUnspent(wallet).All()) {
356+
for (COutput& coin : AvailableCoinsListUnspent(wallet).All()) {
357357
CTxDestination address;
358358
if ((coin.spendable || (wallet.IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS) && coin.solvable)) &&
359359
ExtractDestination(FindNonChangeParentOutput(wallet, coin.outpoint).scriptPubKey, address)) {

0 commit comments

Comments
 (0)