diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp index 2545548df4f45..93b5b96926865 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp @@ -37,7 +37,7 @@ void InitVariablesCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) { } void InitVariablesCheck::registerMatchers(MatchFinder *Finder) { - std::string BadDecl = "badDecl"; + const std::string BadDecl = "badDecl"; Finder->addMatcher( varDecl(unless(hasInitializer(anything())), unless(isInstantiated()), isLocalVarDecl(), unless(isStaticLocal()), isDefinition(), @@ -82,7 +82,7 @@ void InitVariablesCheck::check(const MatchFinder::MatchResult &Result) { if (MatchedDecl->getEndLoc().isMacroID()) return; - QualType TypePtr = MatchedDecl->getType(); + const QualType TypePtr = MatchedDecl->getType(); std::optional InitializationString; bool AddMathInclude = false; diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/MacroUsageCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/MacroUsageCheck.cpp index 0836a5c386dd8..b301a2bd848ac 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/MacroUsageCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/MacroUsageCheck.cpp @@ -47,7 +47,7 @@ class MacroUsageCallbacks : public PPCallbacks { SM.isWrittenInCommandLineFile(MD->getLocation())) return; - StringRef MacroName = MacroNameTok.getIdentifierInfo()->getName(); + const StringRef MacroName = MacroNameTok.getIdentifierInfo()->getName(); if (MacroName == "__GCC_HAVE_DWARF2_CFI_ASM") return; if (!CheckCapsOnly && !RegExp.match(MacroName)) diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/MisleadingCaptureDefaultByValueCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/MisleadingCaptureDefaultByValueCheck.cpp index 57d98ee1fd8b4..366bd1296bf9d 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/MisleadingCaptureDefaultByValueCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/MisleadingCaptureDefaultByValueCheck.cpp @@ -81,7 +81,7 @@ void MisleadingCaptureDefaultByValueCheck::check( return; if (Lambda->getCaptureDefault() == LCD_ByCopy) { - bool IsThisImplicitlyCaptured = std::any_of( + const bool IsThisImplicitlyCaptured = std::any_of( Lambda->implicit_capture_begin(), Lambda->implicit_capture_end(), [](const LambdaCapture &Capture) { return Capture.capturesThis(); }); auto Diag = diag(Lambda->getCaptureDefaultLoc(), @@ -89,8 +89,8 @@ void MisleadingCaptureDefaultByValueCheck::check( "should not specify a by-value capture default") << IsThisImplicitlyCaptured; - std::string ReplacementText = createReplacementText(Lambda); - SourceLocation DefaultCaptureEnd = + const std::string ReplacementText = createReplacementText(Lambda); + const SourceLocation DefaultCaptureEnd = findDefaultCaptureEnd(Lambda, *Result.Context); Diag << FixItHint::CreateReplacement( CharSourceRange::getCharRange(Lambda->getCaptureDefaultLoc(), diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/MissingStdForwardCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/MissingStdForwardCheck.cpp index 090ab2f0474c4..d1d81d510c8fb 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/MissingStdForwardCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/MissingStdForwardCheck.cpp @@ -26,11 +26,12 @@ AST_MATCHER_P(QualType, possiblyPackExpansionOf, } AST_MATCHER(ParmVarDecl, isTemplateTypeParameter) { - ast_matchers::internal::Matcher Inner = possiblyPackExpansionOf( - qualType(rValueReferenceType(), - references(templateTypeParmType( - hasDeclaration(templateTypeParmDecl()))), - unless(references(qualType(isConstQualified()))))); + const ast_matchers::internal::Matcher Inner = + possiblyPackExpansionOf( + qualType(rValueReferenceType(), + references(templateTypeParmType( + hasDeclaration(templateTypeParmDecl()))), + unless(references(qualType(isConstQualified()))))); if (!Inner.matches(Node.getType(), Finder, Builder)) return false; @@ -43,7 +44,7 @@ AST_MATCHER(ParmVarDecl, isTemplateTypeParameter) { if (!FuncTemplate) return false; - QualType ParamType = + const QualType ParamType = Node.getType().getNonPackExpansionType()->getPointeeType(); const auto *TemplateType = ParamType->getAsCanonical(); if (!TemplateType) @@ -54,10 +55,10 @@ AST_MATCHER(ParmVarDecl, isTemplateTypeParameter) { } AST_MATCHER_P(NamedDecl, hasSameNameAsBoundNode, std::string, BindingID) { - IdentifierInfo *II = Node.getIdentifier(); + const IdentifierInfo *II = Node.getIdentifier(); if (nullptr == II) return false; - StringRef Name = II->getName(); + const StringRef Name = II->getName(); return Builder->removeBindings( [this, Name](const ast_matchers::internal::BoundNodesMap &Nodes) { diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/NoSuspendWithLockCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/NoSuspendWithLockCheck.cpp index 43df277927d8b..8ecbccda3c5f2 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/NoSuspendWithLockCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/NoSuspendWithLockCheck.cpp @@ -27,7 +27,7 @@ void NoSuspendWithLockCheck::registerMatchers(MatchFinder *Finder) { hasDeclaration(namedDecl(matchers::matchesAnyListedName( utils::options::parseStringList(LockGuards))))); - StatementMatcher Lock = + const StatementMatcher Lock = declStmt(has(varDecl(hasType(LockType)).bind("lock-decl"))) .bind("lock-decl-stmt"); Finder->addMatcher( @@ -55,12 +55,12 @@ void NoSuspendWithLockCheck::check(const MatchFinder::MatchResult &Result) { Options.AddImplicitDtors = true; Options.AddTemporaryDtors = true; - std::unique_ptr TheCFG = CFG::buildCFG( + const std::unique_ptr TheCFG = CFG::buildCFG( nullptr, const_cast(Block), &Context, Options); if (!TheCFG) return; - utils::ExprSequence Sequence(TheCFG.get(), Block, &Context); + const utils::ExprSequence Sequence(TheCFG.get(), Block, &Context); const Stmt *LastBlockStmt = Block->body_back(); if (Sequence.inSequence(LockStmt, Suspend) && (Suspend == LastBlockStmt || diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp index 9913671c6f74e..51a1468f49813 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp @@ -164,12 +164,12 @@ void PreferMemberInitializerCheck::check( llvm::DenseMap AssignedFields{}; for (const CXXCtorInitializer *Init : Ctor->inits()) - if (FieldDecl *Field = Init->getMember()) + if (const FieldDecl *Field = Init->getMember()) updateAssignmentLevel(Field, Init->getInit(), Ctor, AssignedFields); for (const Stmt *S : Body->body()) { if (S->getBeginLoc().isMacroID()) { - StringRef MacroName = Lexer::getImmediateMacroName( + const StringRef MacroName = Lexer::getImmediateMacroName( S->getBeginLoc(), *Result.SourceManager, getLangOpts()); if (MacroName.contains_insensitive("assert")) return; @@ -206,7 +206,7 @@ void PreferMemberInitializerCheck::check( bool AddComma = false; bool AddBrace = false; bool InvalidFix = false; - unsigned Index = Field->getFieldIndex(); + const unsigned Index = Field->getFieldIndex(); const CXXCtorInitializer *LastInListInit = nullptr; for (const CXXCtorInitializer *Init : Ctor->inits()) { if (!Init->isWritten() || Init->isInClassMemberInitializer()) @@ -276,7 +276,7 @@ void PreferMemberInitializerCheck::check( << Field; if (InvalidFix) continue; - StringRef NewInit = Lexer::getSourceText( + const StringRef NewInit = Lexer::getSourceText( Result.SourceManager->getExpansionRange(InitValue->getSourceRange()), *Result.SourceManager, getLangOpts()); if (HasInitAlready) { @@ -288,8 +288,8 @@ void PreferMemberInitializerCheck::check( else Diag << FixItHint::CreateReplacement(ReplaceRange, NewInit); } else { - SmallString<128> Insertion({InsertPrefix, Field->getName(), "(", NewInit, - AddComma ? "), " : ")"}); + const SmallString<128> Insertion({InsertPrefix, Field->getName(), "(", + NewInit, AddComma ? "), " : ")"}); Diag << FixItHint::CreateInsertion(InsertPos, Insertion, FirstToCtorInits); FirstToCtorInits = areDiagsSelfContained(); diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsArrayToPointerDecayCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsArrayToPointerDecayCheck.cpp index f3237f4d7dae0..d0f86526d1a29 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsArrayToPointerDecayCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsArrayToPointerDecayCheck.cpp @@ -35,7 +35,7 @@ AST_MATCHER_P(Expr, hasParentIgnoringImpCasts, ast_matchers::internal::Matcher, InnerMatcher) { const Expr *E = &Node; do { - DynTypedNodeList Parents = Finder->getASTContext().getParents(*E); + const DynTypedNodeList Parents = Finder->getASTContext().getParents(*E); if (Parents.size() != 1) return false; E = Parents[0].get(); diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp index 634ec186616d5..82fc9f253ac1c 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp @@ -78,7 +78,7 @@ void ProBoundsConstantArrayIndexCheck::check( else BaseRange = cast(Matched)->getArg(0)->getSourceRange(); - SourceRange IndexRange = IndexExpr->getSourceRange(); + const SourceRange IndexRange = IndexExpr->getSourceRange(); auto Diag = diag(Matched->getExprLoc(), "do not use array subscript when the index is " @@ -115,7 +115,7 @@ void ProBoundsConstantArrayIndexCheck::check( const auto &SizeArg = TemplateArgs[1]; if (SizeArg.getKind() != TemplateArgument::Integral) return; - llvm::APInt ArraySize = SizeArg.getAsIntegral(); + const llvm::APInt ArraySize = SizeArg.getAsIntegral(); // Get uint64_t values, because different bitwidths would lead to an assertion // in APInt::uge. diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeCstyleCastCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeCstyleCastCheck.cpp index b9867c2393f0b..fcd9c6d37d99f 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeCstyleCastCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeCstyleCastCheck.cpp @@ -45,7 +45,7 @@ void ProTypeCstyleCastCheck::check(const MatchFinder::MatchResult &Result) { return; } - QualType SourceType = MatchedCast->getSubExpr()->getType(); + const QualType SourceType = MatchedCast->getSubExpr()->getType(); if (MatchedCast->getCastKind() == CK_BaseToDerived) { const auto *SourceDecl = SourceType->getPointeeCXXRecordDecl(); @@ -58,7 +58,7 @@ void ProTypeCstyleCastCheck::check(const MatchFinder::MatchResult &Result) { // Leave type spelling exactly as it was (unlike // getTypeAsWritten().getAsString() which would spell enum types 'enum // X'). - StringRef DestTypeString = Lexer::getSourceText( + const StringRef DestTypeString = Lexer::getSourceText( CharSourceRange::getTokenRange( MatchedCast->getLParenLoc().getLocWithOffset(1), MatchedCast->getRParenLoc().getLocWithOffset(-1)), diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp index 1ac9b8bbdfedb..111c62153fe79 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp @@ -173,7 +173,7 @@ struct InitializerInsertion { assert(!Initializers.empty() && "No initializers to insert"); std::string Code; llvm::raw_string_ostream Stream(Code); - std::string Joined = + const std::string Joined = llvm::join(Initializers.begin(), Initializers.end(), "(), "); switch (Placement) { case InitializerPlacement::New: @@ -434,7 +434,7 @@ static llvm::StringLiteral getInitializer(QualType QT, bool UseAssignment) { void ProTypeMemberInitCheck::checkMissingMemberInitializer( ASTContext &Context, const CXXRecordDecl &ClassDecl, const CXXConstructorDecl *Ctor) { - bool IsUnion = ClassDecl.isUnion(); + const bool IsUnion = ClassDecl.isUnion(); if (IsUnion && ClassDecl.hasInClassInitializer()) return; @@ -583,7 +583,7 @@ void ProTypeMemberInitCheck::checkMissingBaseClassInitializer( void ProTypeMemberInitCheck::checkUninitializedTrivialType( const ASTContext &Context, const VarDecl *Var) { - DiagnosticBuilder Diag = + const DiagnosticBuilder Diag = diag(Var->getBeginLoc(), "uninitialized record type: %0") << Var; Diag << FixItHint::CreateInsertion( diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeStaticCastDowncastCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeStaticCastDowncastCheck.cpp index c200a79cb8c49..e7b92fcf801c1 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeStaticCastDowncastCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeStaticCastDowncastCheck.cpp @@ -33,7 +33,7 @@ void ProTypeStaticCastDowncastCheck::check( const MatchFinder::MatchResult &Result) { const auto *MatchedCast = Result.Nodes.getNodeAs("cast"); - QualType SourceType = MatchedCast->getSubExpr()->getType(); + const QualType SourceType = MatchedCast->getSubExpr()->getType(); const auto *SourceDecl = SourceType->getPointeeCXXRecordDecl(); if (!SourceDecl) // The cast is from object to reference SourceDecl = SourceType->getAsCXXRecordDecl(); diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeVarargCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeVarargCheck.cpp index 431b2a76feeea..c223ed1565d90 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeVarargCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeVarargCheck.cpp @@ -65,9 +65,9 @@ static constexpr StringRef VaArgWarningMessage = namespace { AST_MATCHER(QualType, isVAList) { - ASTContext &Context = Finder->getASTContext(); - QualType Desugar = Node.getDesugaredType(Context); - QualType NodeTy = Node.getUnqualifiedType(); + const ASTContext &Context = Finder->getASTContext(); + const QualType Desugar = Node.getDesugaredType(Context); + const QualType NodeTy = Node.getUnqualifiedType(); auto CheckVaList = [](QualType NodeTy, QualType Expected, const ASTContext &Context) { @@ -88,7 +88,8 @@ AST_MATCHER(QualType, isVAList) { // type. Some targets implements va_list as 'char *' or 'void *'. // In these cases we need to remove all typedefs one by one to check this. using BuiltinVaListKind = TargetInfo::BuiltinVaListKind; - BuiltinVaListKind VaListKind = Context.getTargetInfo().getBuiltinVaListKind(); + const BuiltinVaListKind VaListKind = + Context.getTargetInfo().getBuiltinVaListKind(); if (VaListKind == BuiltinVaListKind::CharPtrBuiltinVaList || VaListKind == BuiltinVaListKind::VoidPtrBuiltinVaList) { if (CheckVaList(NodeTy, Context.getBuiltinVaListType(), Context)) diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/RvalueReferenceParamNotMovedCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/RvalueReferenceParamNotMovedCheck.cpp index c40ac7ab5102b..28bfe57622398 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/RvalueReferenceParamNotMovedCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/RvalueReferenceParamNotMovedCheck.cpp @@ -39,7 +39,7 @@ AST_MATCHER_P2(Stmt, argumentOf, bool, AllowPartialMove, StatementMatcher, void RvalueReferenceParamNotMovedCheck::registerMatchers(MatchFinder *Finder) { auto ToParam = hasAnyParameter(parmVarDecl(equalsBoundNode("param"))); - StatementMatcher MoveCallMatcher = + const StatementMatcher MoveCallMatcher = callExpr( argumentCountIs(1), anyOf(callee(functionDecl(hasName(MoveFunction))), diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.cpp index b38a0c66eb582..77a7b2b25aecb 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.cpp @@ -109,7 +109,7 @@ join(ArrayRef SMFS, llvm::raw_string_ostream Stream(Buffer); Stream << toString(SMFS[0]); - size_t LastIndex = SMFS.size() - 1; + const size_t LastIndex = SMFS.size() - 1; for (size_t I = 1; I < LastIndex; ++I) { Stream << ", " << toString(SMFS[I]); } @@ -146,7 +146,7 @@ void SpecialMemberFunctionsCheck::check( StoreMember({DestructorType, Dtor->isDeleted()}); } - std::initializer_list> + const std::initializer_list> Matchers = {{"copy-ctor", SpecialMemberFunctionKind::CopyConstructor}, {"copy-assign", SpecialMemberFunctionKind::CopyAssignment}, {"move-ctor", SpecialMemberFunctionKind::MoveConstructor}, @@ -202,7 +202,7 @@ void SpecialMemberFunctionsCheck::checkForMissingMembers( MissingMembers.push_back(Kind2); }; - bool RequireThree = + const bool RequireThree = HasMember(SpecialMemberFunctionKind::NonDefaultDestructor) || (!AllowSoleDefaultDtor && (HasMember(SpecialMemberFunctionKind::Destructor) || @@ -212,10 +212,11 @@ void SpecialMemberFunctionsCheck::checkForMissingMembers( HasMember(SpecialMemberFunctionKind::MoveConstructor) || HasMember(SpecialMemberFunctionKind::MoveAssignment); - bool RequireFive = (!AllowMissingMoveFunctions && RequireThree && - getLangOpts().CPlusPlus11) || - HasMember(SpecialMemberFunctionKind::MoveConstructor) || - HasMember(SpecialMemberFunctionKind::MoveAssignment); + const bool RequireFive = + (!AllowMissingMoveFunctions && RequireThree && + getLangOpts().CPlusPlus11) || + HasMember(SpecialMemberFunctionKind::MoveConstructor) || + HasMember(SpecialMemberFunctionKind::MoveAssignment); if (RequireThree) { if (!HasMember(SpecialMemberFunctionKind::Destructor) && diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.h b/clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.h index 3e83f0b19c51e..1d41b578c77ae 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.h +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.h @@ -97,7 +97,7 @@ struct DenseMapInfo< assert(Val != getEmptyKey() && "Cannot hash the empty key!"); assert(Val != getTombstoneKey() && "Cannot hash the tombstone key!"); - std::hash SecondHash; + const std::hash SecondHash; return Val.first.getHashValue() + SecondHash(Val.second); } diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/VirtualClassDestructorCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/VirtualClassDestructorCheck.cpp index 770088991419b..89f1bf1ddfd10 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/VirtualClassDestructorCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/VirtualClassDestructorCheck.cpp @@ -56,10 +56,10 @@ getVirtualKeywordRange(const CXXDestructorDecl &Destructor, if (Destructor.getLocation().isMacroID()) return std::nullopt; - SourceLocation VirtualBeginLoc = Destructor.getBeginLoc(); - SourceLocation VirtualBeginSpellingLoc = + const SourceLocation VirtualBeginLoc = Destructor.getBeginLoc(); + const SourceLocation VirtualBeginSpellingLoc = SM.getSpellingLoc(Destructor.getBeginLoc()); - SourceLocation VirtualEndLoc = VirtualBeginSpellingLoc.getLocWithOffset( + const SourceLocation VirtualEndLoc = VirtualBeginSpellingLoc.getLocWithOffset( Lexer::MeasureTokenLength(VirtualBeginSpellingLoc, SM, LangOpts)); /// Range ends with \c StartOfNextToken so that any whitespace after \c @@ -68,7 +68,7 @@ getVirtualKeywordRange(const CXXDestructorDecl &Destructor, Lexer::findNextToken(VirtualEndLoc, SM, LangOpts); if (!NextToken) return std::nullopt; - SourceLocation StartOfNextToken = NextToken->getLocation(); + const SourceLocation StartOfNextToken = NextToken->getLocation(); return CharSourceRange::getCharRange(VirtualBeginLoc, StartOfNextToken); } @@ -79,7 +79,7 @@ getPublicASDecl(const CXXRecordDecl &StructOrClass) { AS{StructOrClass.decls_begin()}, ASEnd{StructOrClass.decls_end()}; AS != ASEnd; ++AS) { - AccessSpecDecl *ASDecl = *AS; + const AccessSpecDecl *ASDecl = *AS; if (ASDecl->getAccess() == AccessSpecifier::AS_public) return ASDecl; } @@ -125,7 +125,7 @@ static std::string getSourceText(const CXXDestructorDecl &Destructor) { static std::string eraseKeyword(std::string &DestructorString, const std::string &Keyword) { - size_t KeywordIndex = DestructorString.find(Keyword); + const size_t KeywordIndex = DestructorString.find(Keyword); if (KeywordIndex != std::string::npos) DestructorString.erase(KeywordIndex, Keyword.length()); return DestructorString; diff --git a/clang-tools-extra/clang-tidy/custom/QueryCheck.cpp b/clang-tools-extra/clang-tidy/custom/QueryCheck.cpp index f83c138fbfaf5..315ce5840e5d4 100644 --- a/clang-tools-extra/clang-tidy/custom/QueryCheck.cpp +++ b/clang-tools-extra/clang-tidy/custom/QueryCheck.cpp @@ -33,7 +33,7 @@ parseQuery(const ClangTidyOptions::CustomCheckValue &V, clang::query::QuerySession QS({}); llvm::StringRef QueryStringRef{V.Query}; while (!QueryStringRef.empty()) { - query::QueryRef Q = query::QueryParser::parse(QueryStringRef, QS); + const query::QueryRef Q = query::QueryParser::parse(QueryStringRef, QS); switch (Q->Kind) { case query::QK_Match: { const auto &MatchQuery = llvm::cast(*Q); @@ -126,11 +126,11 @@ void QueryCheck::registerMatchers(MatchFinder *Finder) { void QueryCheck::check(const MatchFinder::MatchResult &Result) { auto Emit = [this](const DiagMaps &DiagMaps, const std::string &BindName, const DynTypedNode &Node, DiagnosticIDs::Level Level) { - DiagMaps::const_iterator DiagMapIt = DiagMaps.find(Level); + const DiagMaps::const_iterator DiagMapIt = DiagMaps.find(Level); if (DiagMapIt == DiagMaps.end()) return; const BindNameMapToDiagMessage &BindNameMap = DiagMapIt->second; - BindNameMapToDiagMessage::const_iterator BindNameMapIt = + const BindNameMapToDiagMessage::const_iterator BindNameMapIt = BindNameMap.find(BindName); if (BindNameMapIt == BindNameMap.end()) return; diff --git a/clang-tools-extra/clang-tidy/fuchsia/DefaultArgumentsDeclarationsCheck.cpp b/clang-tools-extra/clang-tidy/fuchsia/DefaultArgumentsDeclarationsCheck.cpp index d80511eb626f5..b22aff1f4381a 100644 --- a/clang-tools-extra/clang-tidy/fuchsia/DefaultArgumentsDeclarationsCheck.cpp +++ b/clang-tools-extra/clang-tidy/fuchsia/DefaultArgumentsDeclarationsCheck.cpp @@ -24,7 +24,7 @@ void DefaultArgumentsDeclarationsCheck::check( if (!D) return; - SourceRange DefaultArgRange = D->getDefaultArgRange(); + const SourceRange DefaultArgRange = D->getDefaultArgRange(); if (DefaultArgRange.getEnd() != D->getEndLoc()) return; @@ -35,10 +35,10 @@ void DefaultArgumentsDeclarationsCheck::check( return; } - SourceLocation StartLocation = + const SourceLocation StartLocation = D->getName().empty() ? D->getBeginLoc() : D->getLocation(); - SourceRange RemovalRange( + const SourceRange RemovalRange( Lexer::getLocForEndOfToken(StartLocation, 0, *Result.SourceManager, Result.Context->getLangOpts()), DefaultArgRange.getEnd()); diff --git a/clang-tools-extra/clang-tidy/fuchsia/MultipleInheritanceCheck.cpp b/clang-tools-extra/clang-tidy/fuchsia/MultipleInheritanceCheck.cpp index 80de0282ee595..652dec9bcc2a9 100644 --- a/clang-tools-extra/clang-tidy/fuchsia/MultipleInheritanceCheck.cpp +++ b/clang-tools-extra/clang-tidy/fuchsia/MultipleInheritanceCheck.cpp @@ -28,7 +28,7 @@ AST_MATCHER(CXXRecordDecl, hasBases) { void MultipleInheritanceCheck::addNodeToInterfaceMap(const CXXRecordDecl *Node, bool IsInterface) { assert(Node->getIdentifier()); - StringRef Name = Node->getIdentifier()->getName(); + const StringRef Name = Node->getIdentifier()->getName(); InterfaceMap.insert(std::make_pair(Name, IsInterface)); } @@ -38,7 +38,7 @@ void MultipleInheritanceCheck::addNodeToInterfaceMap(const CXXRecordDecl *Node, bool MultipleInheritanceCheck::getInterfaceStatus(const CXXRecordDecl *Node, bool &IsInterface) const { assert(Node->getIdentifier()); - StringRef Name = Node->getIdentifier()->getName(); + const StringRef Name = Node->getIdentifier()->getName(); auto Pair = InterfaceMap.find(Name); if (Pair == InterfaceMap.end()) return false; @@ -81,7 +81,7 @@ bool MultipleInheritanceCheck::isInterface(const CXXRecordDecl *Node) { } } - bool CurrentClassIsInterface = isCurrentClassInterface(Node); + const bool CurrentClassIsInterface = isCurrentClassInterface(Node); addNodeToInterfaceMap(Node, CurrentClassIsInterface); return CurrentClassIsInterface; } diff --git a/clang-tools-extra/clang-tidy/fuchsia/OverloadedOperatorCheck.cpp b/clang-tools-extra/clang-tidy/fuchsia/OverloadedOperatorCheck.cpp index e202c288d6986..4a498fbc339f8 100644 --- a/clang-tools-extra/clang-tidy/fuchsia/OverloadedOperatorCheck.cpp +++ b/clang-tools-extra/clang-tidy/fuchsia/OverloadedOperatorCheck.cpp @@ -34,7 +34,7 @@ void OverloadedOperatorCheck::check(const MatchFinder::MatchResult &Result) { const auto *D = Result.Nodes.getNodeAs("decl"); assert(D && "No FunctionDecl captured!"); - SourceLocation Loc = D->getBeginLoc(); + const SourceLocation Loc = D->getBeginLoc(); if (Loc.isValid()) diag(Loc, "overloading %0 is disallowed") << D; } diff --git a/clang-tools-extra/clang-tidy/fuchsia/TemporaryObjectsCheck.cpp b/clang-tools-extra/clang-tidy/fuchsia/TemporaryObjectsCheck.cpp index 7b910b1021979..3acd5fb555532 100644 --- a/clang-tools-extra/clang-tidy/fuchsia/TemporaryObjectsCheck.cpp +++ b/clang-tools-extra/clang-tidy/fuchsia/TemporaryObjectsCheck.cpp @@ -20,7 +20,7 @@ namespace clang::tidy::fuchsia { namespace { AST_MATCHER_P(CXXRecordDecl, matchesAnyName, ArrayRef, Names) { - std::string QualifiedName = Node.getQualifiedNameAsString(); + const std::string QualifiedName = Node.getQualifiedNameAsString(); return llvm::is_contained(Names, QualifiedName); }