https://github.com/rosefromthedead created https://github.com/llvm/llvm-project/pull/172504
Since 8c4950951269ec58296afbeba14e99aef467f84d, getCanonicalTypeUnqualified() calls getUnqualifiedType(), so there's no point in calling that again on its return value. >From 6ee4855e384be828c1c584559336b69ccb0d1b5a Mon Sep 17 00:00:00 2001 From: Rose Hudson <[email protected]> Date: Fri, 28 Nov 2025 15:54:07 +0000 Subject: [PATCH] [Clang][NFC] remove getUnqualifiedType() when it's already unqualified Since 8c4950951269ec58296afbeba14e99aef467f84d, getCanonicalTypeUnqualified() calls getUnqualifiedType(), so there's no point in calling that again on its return value. --- .../FlowSensitive/SmartPointerAccessorCaching.cpp | 8 ++------ clang/lib/CIR/CodeGen/CIRGenCall.cpp | 11 ++++------- clang/lib/CodeGen/CGCall.cpp | 2 +- clang/lib/Sema/SemaDeclCXX.cpp | 5 ++--- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/clang/lib/Analysis/FlowSensitive/SmartPointerAccessorCaching.cpp b/clang/lib/Analysis/FlowSensitive/SmartPointerAccessorCaching.cpp index d87b2e6f03857..5642abeb78ba0 100644 --- a/clang/lib/Analysis/FlowSensitive/SmartPointerAccessorCaching.cpp +++ b/clang/lib/Analysis/FlowSensitive/SmartPointerAccessorCaching.cpp @@ -26,18 +26,14 @@ using ast_matchers::returns; CanQualType getLikeReturnType(QualType RT) { if (!RT.isNull() && RT->isPointerType()) { - return RT->getPointeeType() - ->getCanonicalTypeUnqualified() - .getUnqualifiedType(); + return RT->getPointeeType()->getCanonicalTypeUnqualified(); } return {}; } CanQualType valueLikeReturnType(QualType RT) { if (!RT.isNull() && RT->isReferenceType()) { - return RT.getNonReferenceType() - ->getCanonicalTypeUnqualified() - .getUnqualifiedType(); + return RT.getNonReferenceType()->getCanonicalTypeUnqualified(); } return {}; } diff --git a/clang/lib/CIR/CodeGen/CIRGenCall.cpp b/clang/lib/CIR/CodeGen/CIRGenCall.cpp index 17f0c6dbab35c..f00cd33a0f27d 100644 --- a/clang/lib/CIR/CodeGen/CIRGenCall.cpp +++ b/clang/lib/CIR/CodeGen/CIRGenCall.cpp @@ -317,9 +317,7 @@ arrangeFreeFunctionLikeCall(CIRGenTypes &cgt, CIRGenModule &cgm, for (const CallArg &arg : args) argTypes.push_back(cgt.getASTContext().getCanonicalParamType(arg.ty)); - CanQualType retType = fnType->getReturnType() - ->getCanonicalTypeUnqualified() - .getUnqualifiedType(); + CanQualType retType = fnType->getReturnType()->getCanonicalTypeUnqualified(); assert(!cir::MissingFeatures::opCallFnInfoOpts()); return cgt.arrangeCIRFunctionInfo(retType, argTypes, required); @@ -381,10 +379,9 @@ const CIRGenFunctionInfo &CIRGenTypes::arrangeCXXMethodCall( argTypes.push_back(astContext.getCanonicalParamType(arg.ty)); assert(!cir::MissingFeatures::opCallFnInfoOpts()); - return arrangeCIRFunctionInfo(proto->getReturnType() - ->getCanonicalTypeUnqualified() - .getUnqualifiedType(), - argTypes, required); + return arrangeCIRFunctionInfo( + proto->getReturnType()->getCanonicalTypeUnqualified(), argTypes, + required); } const CIRGenFunctionInfo & diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp index 4a9025b6e0b0f..d7bdeb3981cf8 100644 --- a/clang/lib/CodeGen/CGCall.cpp +++ b/clang/lib/CodeGen/CGCall.cpp @@ -150,7 +150,7 @@ static CanQual<FunctionProtoType> GetFormalType(const CXXMethodDecl *MD) { /// and it makes ABI code a little easier to be able to assume that /// all parameter and return types are top-level unqualified. static CanQualType GetReturnType(QualType RetTy) { - return RetTy->getCanonicalTypeUnqualified().getUnqualifiedType(); + return RetTy->getCanonicalTypeUnqualified(); } /// Arrange the argument and result information for a value of the given diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 001d15a51a58e..4a9340965c645 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -6170,7 +6170,7 @@ struct CheckAbstractUsage { Sel = Sema::AbstractArrayType; T = Info.S.Context.getBaseElementType(T); } - CanQualType CT = T->getCanonicalTypeUnqualified().getUnqualifiedType(); + CanQualType CT = T->getCanonicalTypeUnqualified(); if (CT != Info.AbstractType) return; // It matched; do some magic. @@ -13008,8 +13008,7 @@ static CXXBaseSpecifier *findDirectBaseWithType(CXXRecordDecl *Derived, QualType DesiredBase, bool &AnyDependentBases) { // Check whether the named type is a direct base class. - CanQualType CanonicalDesiredBase = DesiredBase->getCanonicalTypeUnqualified() - .getUnqualifiedType(); + CanQualType CanonicalDesiredBase = DesiredBase->getCanonicalTypeUnqualified(); for (auto &Base : Derived->bases()) { CanQualType BaseType = Base.getType()->getCanonicalTypeUnqualified(); if (CanonicalDesiredBase == BaseType) _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
