mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-09-13 22:41:25 +02:00
05c35c402c
If a `static class` member is not inlined or `constexpr`, the linker will fail when attempting to ODR-use the constant (passing as `const T&`). These can be fixed by finding all member variables that are `const` qualified and inlining them with `constexpr`. There is a clang-tidy pull request that would lint these callsites: https://github.com/llvm/llvm-project/pull/162741 A script was used to modify these sites, however it cannot run as a scripted-diff because it uses clang-query and a build folder. The script only queries for integer and enumeration types, as other data members would have to be marked `constexpr` or `inline` from what I understand: https://en.cppreference.com/cpp/language/static#Constant_static_members Removing the ZMQ forward declaration was a clang-tidy lint. The script used to find these sites, LLM assisted: ``` set -uxo pipefail cd "$(git rev-parse --show-toplevel)" BUILD=${BUILD:-build} if [ ! -f "${BUILD}/compile_commands.json" ]; then echo "error: ${BUILD}/compile_commands.json not found. Run cmake -B ${BUILD} first." >&2 exit 1 fi if ! command -v clang-query >/dev/null; then echo "error: clang-query not on PATH. Install clang-tools." >&2 exit 1 fi if ! git diff --quiet || ! git diff --cached --quiet; then echo "error: working tree has uncommitted changes. Commit or stash first." >&2 exit 1 fi MATCHER='match varDecl(hasParent(cxxRecordDecl()), hasType(qualType(isConstQualified(), anyOf(hasCanonicalType(isInteger()), hasDeclaration(enumDecl())))), hasInitializer(expr()), unless(isConstexpr()), isExpansionInFileMatching("/src/"))' RAW=$(mktemp) trap 'rm -f "$RAW"' EXIT echo "Sweeping TUs (batched, may take a few minutes)..." >&2 find src -type d \( -name secp256k1 -o -name leveldb -o -name crc32c \ -o -name minisketch -o -name libmultiprocess -o -name ctaes \) -prune -o \ -name '*.cpp' -print0 \ | xargs -0 -n 50 clang-query -p "${BUILD}" \ -c 'set output diag' \ -c "${MATCHER}" \ >>"$RAW" || true ROOT=$(pwd) LOCS=$(grep -oE "${ROOT}/src/[^:]+:[0-9]+:[0-9]+:" "$RAW" \ | sed -E "s|^${ROOT}/||; s|:[0-9]+:$||" \ | sort -u) if [ -z "$LOCS" ]; then echo "no matches" >&2 exit 0 fi FILTERED="" while IFS=: read -r file line; do case "$file" in src/secp256k1/*|src/leveldb/*|src/crc32c/*|src/minisketch/*|src/ipc/libmultiprocess/*|src/crypto/ctaes/*) continue ;; src/tinyformat.h) continue ;; esac src=$(sed -n "${line}p" "$file") case "$src" in *inline*) continue ;; esac FILTERED+="${file}:${line}"$'\n' done <<<"$LOCS" FILTERED=$(printf '%s' "$FILTERED" | sed '/^$/d') if [ -z "$FILTERED" ]; then echo "no matches after filtering" >&2 exit 0 fi echo "Sites to rewrite ($(echo "$FILTERED" | wc -l)):" >&2 echo "$FILTERED" >&2 declare -A LINES while IFS=: read -r file line; do LINES[$file]+="${line} " done <<<"$FILTERED" for file in "${!LINES[@]}"; do args=() for line in ${LINES[$file]}; do args+=(-e "${line}s/static const /static constexpr /") done sed -i "${args[@]}" "$file" done echo >&2 echo "===== proposed diff =====" >&2 git --no-pager diff ```
102 lines
3.2 KiB
C++
102 lines
3.2 KiB
C++
// Copyright (c) 2011-present The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#ifndef BITCOIN_QT_RECENTREQUESTSTABLEMODEL_H
|
|
#define BITCOIN_QT_RECENTREQUESTSTABLEMODEL_H
|
|
|
|
#include <qt/sendcoinsrecipient.h>
|
|
|
|
#include <string>
|
|
|
|
#include <QAbstractTableModel>
|
|
#include <QStringList>
|
|
#include <QDateTime>
|
|
|
|
class WalletModel;
|
|
|
|
class RecentRequestEntry
|
|
{
|
|
public:
|
|
RecentRequestEntry() = default;
|
|
|
|
static constexpr int CURRENT_VERSION{1};
|
|
int nVersion{RecentRequestEntry::CURRENT_VERSION};
|
|
int64_t id{0};
|
|
QDateTime date;
|
|
SendCoinsRecipient recipient;
|
|
|
|
SERIALIZE_METHODS(RecentRequestEntry, obj) {
|
|
unsigned int date_timet;
|
|
SER_WRITE(obj, date_timet = obj.date.toSecsSinceEpoch());
|
|
READWRITE(obj.nVersion, obj.id, date_timet, obj.recipient);
|
|
SER_READ(obj, obj.date = QDateTime::fromSecsSinceEpoch(date_timet));
|
|
}
|
|
};
|
|
|
|
class RecentRequestEntryLessThan
|
|
{
|
|
public:
|
|
RecentRequestEntryLessThan(int nColumn, Qt::SortOrder fOrder):
|
|
column(nColumn), order(fOrder) {}
|
|
bool operator()(const RecentRequestEntry& left, const RecentRequestEntry& right) const;
|
|
|
|
private:
|
|
int column;
|
|
Qt::SortOrder order;
|
|
};
|
|
|
|
/** Model for list of recently generated payment requests / bitcoin: URIs.
|
|
* Part of wallet model.
|
|
*/
|
|
class RecentRequestsTableModel: public QAbstractTableModel
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit RecentRequestsTableModel(WalletModel *parent);
|
|
~RecentRequestsTableModel();
|
|
|
|
enum ColumnIndex {
|
|
Date = 0,
|
|
Label = 1,
|
|
Message = 2,
|
|
Amount = 3,
|
|
NUMBER_OF_COLUMNS
|
|
};
|
|
|
|
/** @name Methods overridden from QAbstractTableModel
|
|
@{*/
|
|
int rowCount(const QModelIndex &parent) const override;
|
|
int columnCount(const QModelIndex &parent) const override;
|
|
QVariant data(const QModelIndex &index, int role) const override;
|
|
bool setData(const QModelIndex &index, const QVariant &value, int role) override;
|
|
QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
|
|
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
|
|
bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
|
|
Qt::ItemFlags flags(const QModelIndex &index) const override;
|
|
void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
|
|
/*@}*/
|
|
|
|
const RecentRequestEntry &entry(int row) const { return list[row]; }
|
|
void addNewRequest(const SendCoinsRecipient &recipient);
|
|
void addNewRequest(const std::string &recipient);
|
|
void addNewRequest(RecentRequestEntry &recipient);
|
|
|
|
public Q_SLOTS:
|
|
void updateDisplayUnit();
|
|
|
|
private:
|
|
WalletModel *walletModel;
|
|
QStringList columns;
|
|
QList<RecentRequestEntry> list;
|
|
int64_t nReceiveRequestsMaxId{0};
|
|
|
|
/** Updates the column title to "Amount (DisplayUnit)" and emits headerDataChanged() signal for table headers to react. */
|
|
void updateAmountColumnTitle();
|
|
/** Gets title for amount column including current display unit if optionsModel reference available. */
|
|
QString getAmountTitle();
|
|
};
|
|
|
|
#endif // BITCOIN_QT_RECENTREQUESTSTABLEMODEL_H
|