From 647e48cf5f6094ad874766c1471410641b1b86bd Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Sun, 16 Oct 2022 10:11:29 -0700 Subject: [PATCH] [clang] Use std::clamp (NFC) Note that the constructor of MipsABIInfo guarantees that MinABIStackAlignInBytes <= StackAlignInBytes, so we can use std::clamp safely. --- clang/lib/CodeGen/TargetInfo.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clang/lib/CodeGen/TargetInfo.cpp b/clang/lib/CodeGen/TargetInfo.cpp index 74997f0..bfe0fbe 100644 --- a/clang/lib/CodeGen/TargetInfo.cpp +++ b/clang/lib/CodeGen/TargetInfo.cpp @@ -7845,7 +7845,7 @@ void MSP430TargetCodeGenInfo::setTargetAttributes( namespace { class MipsABIInfo : public ABIInfo { bool IsO32; - unsigned MinABIStackAlignInBytes, StackAlignInBytes; + const unsigned MinABIStackAlignInBytes, StackAlignInBytes; void CoerceToIntArgs(uint64_t TySize, SmallVectorImpl &ArgList) const; llvm::Type* HandleAggregates(QualType Ty, uint64_t TySize) const; @@ -8022,8 +8022,8 @@ MipsABIInfo::classifyArgumentType(QualType Ty, uint64_t &Offset) const { uint64_t TySize = getContext().getTypeSize(Ty); uint64_t Align = getContext().getTypeAlign(Ty) / 8; - Align = std::min(std::max(Align, (uint64_t)MinABIStackAlignInBytes), - (uint64_t)StackAlignInBytes); + Align = std::clamp(Align, (uint64_t)MinABIStackAlignInBytes, + (uint64_t)StackAlignInBytes); unsigned CurrOffset = llvm::alignTo(Offset, Align); Offset = CurrOffset + llvm::alignTo(TySize, Align * 8) / 8; -- 2.7.4