[clang] 1188f24 - Revert "[clang-format][NFC] Prefer pass by reference"
Björn Schäpers via cfe-commits
cfe-commits at lists.llvm.org
Mon Jan 3 14:07:32 PST 2022
Author: Björn Schäpers
Date: 2022-01-03T23:06:56+01:00
New Revision: 1188f241acb78dacef00b7b6b3ec0b04cb43c786
URL: https://github.com/llvm/llvm-project/commit/1188f241acb78dacef00b7b6b3ec0b04cb43c786
DIFF: https://github.com/llvm/llvm-project/commit/1188f241acb78dacef00b7b6b3ec0b04cb43c786.diff
LOG: Revert "[clang-format][NFC] Prefer pass by reference"
This reverts commit 25f637913fe31b6d23e78ff07c725bb537dd3b97.
Differential Revision: https://reviews.llvm.org/D115061
Added:
Modified:
clang/lib/Format/UnwrappedLineFormatter.cpp
Removed:
################################################################################
diff --git a/clang/lib/Format/UnwrappedLineFormatter.cpp b/clang/lib/Format/UnwrappedLineFormatter.cpp
index 2d71a939d7b7..303150348ad8 100644
--- a/clang/lib/Format/UnwrappedLineFormatter.cpp
+++ b/clang/lib/Format/UnwrappedLineFormatter.cpp
@@ -1064,9 +1064,9 @@ class OptimizingLineFormatter : public LineFormatter {
FormatDecision LastFormat = Node->State.NextToken->getDecision();
if (LastFormat == FD_Unformatted || LastFormat == FD_Continue)
- addNextStateToQueue(Penalty, Node, /*NewLine=*/false, Count, Queue);
+ addNextStateToQueue(Penalty, Node, /*NewLine=*/false, &Count, &Queue);
if (LastFormat == FD_Unformatted || LastFormat == FD_Break)
- addNextStateToQueue(Penalty, Node, /*NewLine=*/true, Count, Queue);
+ addNextStateToQueue(Penalty, Node, /*NewLine=*/true, &Count, &Queue);
}
if (Queue.empty()) {
@@ -1092,7 +1092,7 @@ class OptimizingLineFormatter : public LineFormatter {
/// Assume the current state is \p PreviousNode and has been reached with a
/// penalty of \p Penalty. Insert a line break if \p NewLine is \c true.
void addNextStateToQueue(unsigned Penalty, StateNode *PreviousNode,
- bool NewLine, unsigned &Count, QueueType &Queue) {
+ bool NewLine, unsigned *Count, QueueType *Queue) {
if (NewLine && !Indenter->canBreak(PreviousNode->State))
return;
if (!NewLine && Indenter->mustBreak(PreviousNode->State))
@@ -1105,8 +1105,8 @@ class OptimizingLineFormatter : public LineFormatter {
Penalty += Indenter->addTokenToState(Node->State, NewLine, true);
- Queue.push(QueueItem(OrderedPenalty(Penalty, Count), Node));
- ++Count;
+ Queue->push(QueueItem(OrderedPenalty(Penalty, *Count), Node));
+ ++(*Count);
}
/// Applies the best formatting by reconstructing the path in the
More information about the cfe-commits
mailing list