Skip to content

[ADT, Support] Use std::min and std::max (NFC) #164145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 19, 2025
Merged

[ADT, Support] Use std::min and std::max (NFC) #164145

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0b235a
[ADT, Support] Use std::min and std::max (NFC)
kazutakahirata Oct 18, 2025
e70d43a
Address a comment.
kazutakahirata Oct 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions llvm/include/llvm/ADT/PagedVector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,7 @@ template <typename T, size_t PageSize = 1024 / sizeof(T)> class PagedVector {
while (ElementIdx < PV->Size &&
!PV->PageToDataPtrs[ElementIdx / PageSize])
ElementIdx += PageSize;
if (ElementIdx > PV->Size)
ElementIdx = PV->Size;
ElementIdx = std::min(ElementIdx, PV->Size);
}

return *this;
Expand Down
3 changes: 1 addition & 2 deletions llvm/include/llvm/Support/Format.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,7 @@ class FormattedBytes {
: Bytes(B), FirstByteOffset(O), IndentLevel(IL), NumPerLine(NPL),
ByteGroupSize(BGS), Upper(U), ASCII(A) {

if (ByteGroupSize > NumPerLine)
ByteGroupSize = NumPerLine;
ByteGroupSize = std::min<uint32_t>(ByteGroupSize, NumPerLine);
}
};

Expand Down
2 changes: 1 addition & 1 deletion llvm/include/llvm/Support/GraphWriter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ template <typename GraphType, typename Derived> class GraphWriterBase {
const void *DestNodeID, int DestNodePort,
const std::string &Attrs) {
if (SrcNodePort > 64) return; // Eminating from truncated part?
if (DestNodePort > 64) DestNodePort = 64; // Targeting the truncated part?
DestNodePort = std::min(DestNodePort, 64); // Targeting the truncated part?

O << "\tNode" << SrcNodeID;
if (SrcNodePort >= 0)
Expand Down
9 changes: 3 additions & 6 deletions llvm/lib/Support/APFloat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2600,8 +2600,7 @@ APFloat::opStatus IEEEFloat::convert(const fltSemantics &toSemantics,
int exponentChange = omsb - fromSemantics.precision;
if (exponent + exponentChange < toSemantics.minExponent)
exponentChange = toSemantics.minExponent - exponent;
if (exponentChange < shift)
exponentChange = shift;
exponentChange = std::max(exponentChange, shift);
if (exponentChange < 0) {
shift -= exponentChange;
exponent += exponentChange;
Expand Down Expand Up @@ -3043,8 +3042,7 @@ IEEEFloat::roundSignificandWithExponent(const integerPart *decSigParts,
if (decSig.exponent < semantics->minExponent) {
excessPrecision += (semantics->minExponent - decSig.exponent);
truncatedBits = excessPrecision;
if (excessPrecision > calcSemantics.precision)
excessPrecision = calcSemantics.precision;
excessPrecision = std::min(excessPrecision, calcSemantics.precision);
}
/* Extra half-ulp lost in reciprocal of exponent. */
powHUerr = (powStatus == opOK && calcLostFraction == lfExactlyZero) ? 0:2;
Expand Down Expand Up @@ -3441,8 +3439,7 @@ char *IEEEFloat::convertNormalToHexString(char *dst, unsigned int hexDigits,
/* Convert as much of "part" to hexdigits as we can. */
unsigned int curDigits = integerPartWidth / 4;

if (curDigits > outputDigits)
curDigits = outputDigits;
curDigits = std::min(curDigits, outputDigits);
dst += partAsHex (dst, part, curDigits, hexDigitChars);
outputDigits -= curDigits;
}
Expand Down
3 changes: 1 addition & 2 deletions llvm/lib/Support/Unix/Signals.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,8 +868,7 @@ void llvm::sys::PrintStackTrace(raw_ostream &OS, int Depth) {
nwidth = strlen(name) - 1;
}

if (nwidth > width)
width = nwidth;
width = std::max(nwidth, width);
}

for (int i = 0; i < depth; ++i) {
Expand Down