From a0d8b00ee9a3024bfd88cc75682c5fef82ce1523 Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Sun, 4 Oct 2015 04:53:55 +0000 Subject: [PATCH] SourceRanges are small and trivially copyable, don't them by reference. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@249259 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../clang/ASTMatchers/Dynamic/Diagnostics.h | 6 ++-- include/clang/ASTMatchers/Dynamic/Parser.h | 4 +-- include/clang/ASTMatchers/Dynamic/Registry.h | 4 +-- include/clang/Basic/Diagnostic.h | 4 +-- include/clang/Basic/PartialDiagnostic.h | 2 +- include/clang/Basic/SourceLocation.h | 2 +- include/clang/Sema/DeclSpec.h | 10 +++---- include/clang/Sema/Sema.h | 6 ++-- .../Core/BugReporter/PathDiagnostic.h | 2 +- lib/ASTMatchers/Dynamic/Diagnostics.cpp | 8 +++--- lib/ASTMatchers/Dynamic/Marshallers.h | 22 +++++++-------- lib/ASTMatchers/Dynamic/Parser.cpp | 2 +- lib/ASTMatchers/Dynamic/Registry.cpp | 4 +-- lib/Format/WhitespaceManager.cpp | 4 +-- lib/Format/WhitespaceManager.h | 4 +-- lib/Lex/PPExpressions.cpp | 2 +- lib/Lex/PPMacroExpansion.cpp | 4 +-- lib/Parse/ParseDeclCXX.cpp | 2 +- lib/Sema/SemaCast.cpp | 28 +++++++++---------- lib/Sema/SemaDeclCXX.cpp | 4 +-- lib/Sema/SemaExceptionSpec.cpp | 2 +- lib/Sema/SemaExpr.cpp | 2 +- lib/Sema/SemaOpenMP.cpp | 5 ++-- lib/Sema/SemaOverload.cpp | 2 +- .../Checkers/CallAndMessageChecker.cpp | 4 +-- lib/StaticAnalyzer/Core/BugReporter.cpp | 6 ++-- .../Core/BugReporterVisitors.cpp | 2 +- tools/libclang/CIndex.cpp | 2 +- 28 files changed, 73 insertions(+), 76 deletions(-) diff --git a/include/clang/ASTMatchers/Dynamic/Diagnostics.h b/include/clang/ASTMatchers/Dynamic/Diagnostics.h index ef93ac5450..2c76ddaa07 100644 --- a/include/clang/ASTMatchers/Dynamic/Diagnostics.h +++ b/include/clang/ASTMatchers/Dynamic/Diagnostics.h @@ -104,11 +104,11 @@ public: /// \brief About to call the constructor for a matcher. enum ConstructMatcherEnum { ConstructMatcher }; Context(ConstructMatcherEnum, Diagnostics *Error, StringRef MatcherName, - const SourceRange &MatcherRange); + SourceRange MatcherRange); /// \brief About to recurse into parsing one argument for a matcher. enum MatcherArgEnum { MatcherArg }; Context(MatcherArgEnum, Diagnostics *Error, StringRef MatcherName, - const SourceRange &MatcherRange, unsigned ArgNumber); + SourceRange MatcherRange, unsigned ArgNumber); ~Context(); private: @@ -137,7 +137,7 @@ public: /// All the context information will be kept on the error message. /// \return a helper class to allow the caller to pass the arguments for the /// error message, using the << operator. - ArgStream addError(const SourceRange &Range, ErrorType Error); + ArgStream addError(SourceRange Range, ErrorType Error); /// \brief Information stored for one frame of the context. struct ContextFrame { diff --git a/include/clang/ASTMatchers/Dynamic/Parser.h b/include/clang/ASTMatchers/Dynamic/Parser.h index cdc259e0d0..76926f09db 100644 --- a/include/clang/ASTMatchers/Dynamic/Parser.h +++ b/include/clang/ASTMatchers/Dynamic/Parser.h @@ -81,7 +81,7 @@ public: /// matcher if an error occurred. In that case, \c Error will contain a /// description of the error. virtual VariantMatcher actOnMatcherExpression(MatcherCtor Ctor, - const SourceRange &NameRange, + SourceRange NameRange, StringRef BindID, ArrayRef Args, Diagnostics *Error) = 0; @@ -129,7 +129,7 @@ public: lookupMatcherCtor(StringRef MatcherName) override; VariantMatcher actOnMatcherExpression(MatcherCtor Ctor, - const SourceRange &NameRange, + SourceRange NameRange, StringRef BindID, ArrayRef Args, Diagnostics *Error) override; diff --git a/include/clang/ASTMatchers/Dynamic/Registry.h b/include/clang/ASTMatchers/Dynamic/Registry.h index fc1e783a6c..3808adb11e 100644 --- a/include/clang/ASTMatchers/Dynamic/Registry.h +++ b/include/clang/ASTMatchers/Dynamic/Registry.h @@ -106,7 +106,7 @@ public: /// the signature. In that case \c Error will contain the description of /// the error. static VariantMatcher constructMatcher(MatcherCtor Ctor, - const SourceRange &NameRange, + SourceRange NameRange, ArrayRef Args, Diagnostics *Error); @@ -117,7 +117,7 @@ public: /// If the matcher is not bindable, it sets an error in \c Error and returns /// a null matcher. static VariantMatcher constructBoundMatcher(MatcherCtor Ctor, - const SourceRange &NameRange, + SourceRange NameRange, StringRef BindID, ArrayRef Args, Diagnostics *Error); diff --git a/include/clang/Basic/Diagnostic.h b/include/clang/Basic/Diagnostic.h index c80eb96799..1d6c19bc95 100644 --- a/include/clang/Basic/Diagnostic.h +++ b/include/clang/Basic/Diagnostic.h @@ -1076,14 +1076,14 @@ operator<<(const DiagnosticBuilder &DB, T *DC) { } inline const DiagnosticBuilder &operator<<(const DiagnosticBuilder &DB, - const SourceRange &R) { + SourceRange R) { DB.AddSourceRange(CharSourceRange::getTokenRange(R)); return DB; } inline const DiagnosticBuilder &operator<<(const DiagnosticBuilder &DB, ArrayRef Ranges) { - for (const SourceRange &R: Ranges) + for (SourceRange R : Ranges) DB.AddSourceRange(CharSourceRange::getTokenRange(R)); return DB; } diff --git a/include/clang/Basic/PartialDiagnostic.h b/include/clang/Basic/PartialDiagnostic.h index 84c8dd1596..53ce95cab1 100644 --- a/include/clang/Basic/PartialDiagnostic.h +++ b/include/clang/Basic/PartialDiagnostic.h @@ -377,7 +377,7 @@ public: } friend inline const PartialDiagnostic &operator<<(const PartialDiagnostic &PD, - const SourceRange &R) { + SourceRange R) { PD.AddSourceRange(CharSourceRange::getTokenRange(R)); return PD; } diff --git a/include/clang/Basic/SourceLocation.h b/include/clang/Basic/SourceLocation.h index 65cf3b2929..0aeba5e3f3 100644 --- a/include/clang/Basic/SourceLocation.h +++ b/include/clang/Basic/SourceLocation.h @@ -253,7 +253,7 @@ public: SourceLocation getBegin() const { return Range.getBegin(); } SourceLocation getEnd() const { return Range.getEnd(); } - const SourceRange &getAsRange() const { return Range; } + SourceRange getAsRange() const { return Range; } void setBegin(SourceLocation b) { Range.setBegin(b); } void setEnd(SourceLocation e) { Range.setEnd(e); } diff --git a/include/clang/Sema/DeclSpec.h b/include/clang/Sema/DeclSpec.h index 1bd2bb8d92..9c8f2bb0f9 100644 --- a/include/clang/Sema/DeclSpec.h +++ b/include/clang/Sema/DeclSpec.h @@ -70,8 +70,8 @@ class CXXScopeSpec { NestedNameSpecifierLocBuilder Builder; public: - const SourceRange &getRange() const { return Range; } - void setRange(const SourceRange &R) { Range = R; } + SourceRange getRange() const { return Range; } + void setRange(SourceRange R) { Range = R; } void setBeginLoc(SourceLocation Loc) { Range.setBegin(Loc); } void setEndLoc(SourceLocation Loc) { Range.setEnd(Loc); } SourceLocation getBeginLoc() const { return Range.getBegin(); } @@ -493,7 +493,7 @@ public: CXXScopeSpec &getTypeSpecScope() { return TypeScope; } const CXXScopeSpec &getTypeSpecScope() const { return TypeScope; } - const SourceRange &getSourceRange() const LLVM_READONLY { return Range; } + SourceRange getSourceRange() const LLVM_READONLY { return Range; } SourceLocation getLocStart() const LLVM_READONLY { return Range.getBegin(); } SourceLocation getLocEnd() const LLVM_READONLY { return Range.getEnd(); } @@ -1715,7 +1715,7 @@ public: } /// \brief Get the source range that spans this declarator. - const SourceRange &getSourceRange() const LLVM_READONLY { return Range; } + SourceRange getSourceRange() const LLVM_READONLY { return Range; } SourceLocation getLocStart() const LLVM_READONLY { return Range.getBegin(); } SourceLocation getLocEnd() const LLVM_READONLY { return Range.getEnd(); } @@ -1735,7 +1735,7 @@ public: /// given declspec, unless its location is invalid. Adopts the range start if /// the current range start is invalid. void ExtendWithDeclSpec(const DeclSpec &DS) { - const SourceRange &SR = DS.getSourceRange(); + SourceRange SR = DS.getSourceRange(); if (Range.getBegin().isInvalid()) Range.setBegin(SR.getBegin()); if (!SR.getEnd().isInvalid()) diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h index 47ebc2c8fd..1e949fcceb 100644 --- a/include/clang/Sema/Sema.h +++ b/include/clang/Sema/Sema.h @@ -1278,7 +1278,7 @@ public: const FunctionProtoType *FPT); void UpdateExceptionSpec(FunctionDecl *FD, const FunctionProtoType::ExceptionSpecInfo &ESI); - bool CheckSpecifiedExceptionType(QualType &T, const SourceRange &Range); + bool CheckSpecifiedExceptionType(QualType &T, SourceRange Range); bool CheckDistantExceptionSpec(QualType T); bool CheckEquivalentExceptionSpec(FunctionDecl *Old, FunctionDecl *New); bool CheckEquivalentExceptionSpec( @@ -2473,7 +2473,7 @@ public: ExprResult &SrcExpr, bool DoFunctionPointerConverion = false, bool Complain = false, - const SourceRange& OpRangeForComplaining = SourceRange(), + SourceRange OpRangeForComplaining = SourceRange(), QualType DestTypeForComplaining = QualType(), unsigned DiagIDForComplaining = 0); @@ -3783,7 +3783,7 @@ public: ActOnUnaryExprOrTypeTraitExpr(SourceLocation OpLoc, UnaryExprOrTypeTrait ExprKind, bool IsType, void *TyOrEx, - const SourceRange &ArgRange); + SourceRange ArgRange); ExprResult CheckPlaceholderExpr(Expr *E); bool CheckVecStepExpr(Expr *E); diff --git a/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h b/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h index 61cdeb33a2..35421f9455 100644 --- a/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h +++ b/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h @@ -122,7 +122,7 @@ class PathDiagnosticRange : public SourceRange { public: bool isPoint; - PathDiagnosticRange(const SourceRange &R, bool isP = false) + PathDiagnosticRange(SourceRange R, bool isP = false) : SourceRange(R), isPoint(isP) {} PathDiagnosticRange() : isPoint(false) {} diff --git a/lib/ASTMatchers/Dynamic/Diagnostics.cpp b/lib/ASTMatchers/Dynamic/Diagnostics.cpp index 72f127185e..787b780c42 100644 --- a/lib/ASTMatchers/Dynamic/Diagnostics.cpp +++ b/lib/ASTMatchers/Dynamic/Diagnostics.cpp @@ -23,14 +23,14 @@ Diagnostics::ArgStream Diagnostics::pushContextFrame(ContextType Type, Diagnostics::Context::Context(ConstructMatcherEnum, Diagnostics *Error, StringRef MatcherName, - const SourceRange &MatcherRange) + SourceRange MatcherRange) : Error(Error) { Error->pushContextFrame(CT_MatcherConstruct, MatcherRange) << MatcherName; } Diagnostics::Context::Context(MatcherArgEnum, Diagnostics *Error, StringRef MatcherName, - const SourceRange &MatcherRange, + SourceRange MatcherRange, unsigned ArgNumber) : Error(Error) { Error->pushContextFrame(CT_MatcherArg, MatcherRange) << ArgNumber @@ -63,7 +63,7 @@ Diagnostics::ArgStream &Diagnostics::ArgStream::operator<<(const Twine &Arg) { return *this; } -Diagnostics::ArgStream Diagnostics::addError(const SourceRange &Range, +Diagnostics::ArgStream Diagnostics::addError(SourceRange Range, ErrorType Error) { Errors.emplace_back(); ErrorContent &Last = Errors.back(); @@ -150,7 +150,7 @@ static void formatErrorString(StringRef FormatString, } } -static void maybeAddLineAndColumn(const SourceRange &Range, +static void maybeAddLineAndColumn(SourceRange Range, llvm::raw_ostream &OS) { if (Range.Start.Line > 0 && Range.Start.Column > 0) { OS << Range.Start.Line << ":" << Range.Start.Column << ": "; diff --git a/lib/ASTMatchers/Dynamic/Marshallers.h b/lib/ASTMatchers/Dynamic/Marshallers.h index 36a6415ae8..64d6b7814a 100644 --- a/lib/ASTMatchers/Dynamic/Marshallers.h +++ b/lib/ASTMatchers/Dynamic/Marshallers.h @@ -104,7 +104,7 @@ public: class MatcherDescriptor { public: virtual ~MatcherDescriptor() {} - virtual VariantMatcher create(const SourceRange &NameRange, + virtual VariantMatcher create(SourceRange NameRange, ArrayRef Args, Diagnostics *Error) const = 0; @@ -162,7 +162,7 @@ class FixedArgCountMatcherDescriptor : public MatcherDescriptor { public: typedef VariantMatcher (*MarshallerType)(void (*Func)(), StringRef MatcherName, - const SourceRange &NameRange, + SourceRange NameRange, ArrayRef Args, Diagnostics *Error); @@ -180,7 +180,7 @@ public: RetKinds(RetKinds.begin(), RetKinds.end()), ArgKinds(ArgKinds.begin(), ArgKinds.end()) {} - VariantMatcher create(const SourceRange &NameRange, + VariantMatcher create(SourceRange NameRange, ArrayRef Args, Diagnostics *Error) const override { return Marshaller(Func, MatcherName, NameRange, Args, Error); @@ -279,7 +279,7 @@ struct BuildReturnTypeVector > { template )> VariantMatcher -variadicMatcherDescriptor(StringRef MatcherName, const SourceRange &NameRange, +variadicMatcherDescriptor(StringRef MatcherName, SourceRange NameRange, ArrayRef Args, Diagnostics *Error) { ArgT **InnerArgs = new ArgT *[Args.size()](); @@ -320,7 +320,7 @@ variadicMatcherDescriptor(StringRef MatcherName, const SourceRange &NameRange, class VariadicFuncMatcherDescriptor : public MatcherDescriptor { public: typedef VariantMatcher (*RunFunc)(StringRef MatcherName, - const SourceRange &NameRange, + SourceRange NameRange, ArrayRef Args, Diagnostics *Error); @@ -334,7 +334,7 @@ public: BuildReturnTypeVector::build(RetKinds); } - VariantMatcher create(const SourceRange &NameRange, + VariantMatcher create(SourceRange NameRange, ArrayRef Args, Diagnostics *Error) const override { return Func(MatcherName, NameRange, Args, Error); @@ -414,7 +414,7 @@ private: /// \brief 0-arg marshaller function. template static VariantMatcher matcherMarshall0(void (*Func)(), StringRef MatcherName, - const SourceRange &NameRange, + SourceRange NameRange, ArrayRef Args, Diagnostics *Error) { typedef ReturnType (*FuncType)(); @@ -425,7 +425,7 @@ static VariantMatcher matcherMarshall0(void (*Func)(), StringRef MatcherName, /// \brief 1-arg marshaller function. template static VariantMatcher matcherMarshall1(void (*Func)(), StringRef MatcherName, - const SourceRange &NameRange, + SourceRange NameRange, ArrayRef Args, Diagnostics *Error) { typedef ReturnType (*FuncType)(ArgType1); @@ -438,7 +438,7 @@ static VariantMatcher matcherMarshall1(void (*Func)(), StringRef MatcherName, /// \brief 2-arg marshaller function. template static VariantMatcher matcherMarshall2(void (*Func)(), StringRef MatcherName, - const SourceRange &NameRange, + SourceRange NameRange, ArrayRef Args, Diagnostics *Error) { typedef ReturnType (*FuncType)(ArgType1, ArgType2); @@ -493,7 +493,7 @@ public: ~OverloadedMatcherDescriptor() override {} - VariantMatcher create(const SourceRange &NameRange, + VariantMatcher create(SourceRange NameRange, ArrayRef Args, Diagnostics *Error) const override { std::vector Constructed; @@ -567,7 +567,7 @@ public: : MinCount(MinCount), MaxCount(MaxCount), Op(Op), MatcherName(MatcherName) {} - VariantMatcher create(const SourceRange &NameRange, + VariantMatcher create(SourceRange NameRange, ArrayRef Args, Diagnostics *Error) const override { if (Args.size() < MinCount || MaxCount < Args.size()) { diff --git a/lib/ASTMatchers/Dynamic/Parser.cpp b/lib/ASTMatchers/Dynamic/Parser.cpp index 96a78cd9f8..cf9dab6dc7 100644 --- a/lib/ASTMatchers/Dynamic/Parser.cpp +++ b/lib/ASTMatchers/Dynamic/Parser.cpp @@ -534,7 +534,7 @@ Parser::RegistrySema::lookupMatcherCtor(StringRef MatcherName) { } VariantMatcher Parser::RegistrySema::actOnMatcherExpression( - MatcherCtor Ctor, const SourceRange &NameRange, StringRef BindID, + MatcherCtor Ctor, SourceRange NameRange, StringRef BindID, ArrayRef Args, Diagnostics *Error) { if (BindID.empty()) { return Registry::constructMatcher(Ctor, NameRange, Args, Error); diff --git a/lib/ASTMatchers/Dynamic/Registry.cpp b/lib/ASTMatchers/Dynamic/Registry.cpp index 67a9d8abbb..1bf4c5b21d 100644 --- a/lib/ASTMatchers/Dynamic/Registry.cpp +++ b/lib/ASTMatchers/Dynamic/Registry.cpp @@ -519,7 +519,7 @@ Registry::getMatcherCompletions(ArrayRef AcceptedTypes) { // static VariantMatcher Registry::constructMatcher(MatcherCtor Ctor, - const SourceRange &NameRange, + SourceRange NameRange, ArrayRef Args, Diagnostics *Error) { return Ctor->create(NameRange, Args, Error); @@ -527,7 +527,7 @@ VariantMatcher Registry::constructMatcher(MatcherCtor Ctor, // static VariantMatcher Registry::constructBoundMatcher(MatcherCtor Ctor, - const SourceRange &NameRange, + SourceRange NameRange, StringRef BindID, ArrayRef Args, Diagnostics *Error) { diff --git a/lib/Format/WhitespaceManager.cpp b/lib/Format/WhitespaceManager.cpp index 18d73b553e..1b11e73c53 100644 --- a/lib/Format/WhitespaceManager.cpp +++ b/lib/Format/WhitespaceManager.cpp @@ -26,7 +26,7 @@ operator()(const Change &C1, const Change &C2) const { } WhitespaceManager::Change::Change( - bool CreateReplacement, const SourceRange &OriginalWhitespaceRange, + bool CreateReplacement, SourceRange OriginalWhitespaceRange, unsigned IndentLevel, int Spaces, unsigned StartOfTokenColumn, unsigned NewlinesBefore, StringRef PreviousLinePostfix, StringRef CurrentLinePrefix, tok::TokenKind Kind, bool ContinuesPPDirective, @@ -510,7 +510,7 @@ void WhitespaceManager::generateChanges() { } } -void WhitespaceManager::storeReplacement(const SourceRange &Range, +void WhitespaceManager::storeReplacement(SourceRange Range, StringRef Text) { unsigned WhitespaceLength = SourceMgr.getFileOffset(Range.getEnd()) - SourceMgr.getFileOffset(Range.getBegin()); diff --git a/lib/Format/WhitespaceManager.h b/lib/Format/WhitespaceManager.h index 8e03c6d3fc..4075911cd7 100644 --- a/lib/Format/WhitespaceManager.h +++ b/lib/Format/WhitespaceManager.h @@ -106,7 +106,7 @@ private: /// /// \p StartOfTokenColumn and \p InPPDirective will be used to lay out /// trailing comments and escaped newlines. - Change(bool CreateReplacement, const SourceRange &OriginalWhitespaceRange, + Change(bool CreateReplacement, SourceRange OriginalWhitespaceRange, unsigned IndentLevel, int Spaces, unsigned StartOfTokenColumn, unsigned NewlinesBefore, StringRef PreviousLinePostfix, StringRef CurrentLinePrefix, tok::TokenKind Kind, @@ -200,7 +200,7 @@ private: void generateChanges(); /// \brief Stores \p Text as the replacement for the whitespace in \p Range. - void storeReplacement(const SourceRange &Range, StringRef Text); + void storeReplacement(SourceRange Range, StringRef Text); void appendNewlineText(std::string &Text, unsigned Newlines); void appendNewlineText(std::string &Text, unsigned Newlines, unsigned PreviousEndOfTokenColumn, diff --git a/lib/Lex/PPExpressions.cpp b/lib/Lex/PPExpressions.cpp index 4451302339..d2156d49cf 100644 --- a/lib/Lex/PPExpressions.cpp +++ b/lib/Lex/PPExpressions.cpp @@ -42,7 +42,7 @@ public: unsigned getBitWidth() const { return Val.getBitWidth(); } bool isUnsigned() const { return Val.isUnsigned(); } - const SourceRange &getRange() const { return Range; } + SourceRange getRange() const { return Range; } void setRange(SourceLocation L) { Range.setBegin(L); Range.setEnd(L); } void setRange(SourceLocation B, SourceLocation E) { diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp index ba49437a06..3e834289f6 100644 --- a/lib/Lex/PPMacroExpansion.cpp +++ b/lib/Lex/PPMacroExpansion.cpp @@ -871,7 +871,7 @@ MacroArgs *Preprocessor::ReadFunctionLikeMacroArgs(Token &MacroName, DiagnosticBuilder DB = Diag(MacroName, diag::note_init_list_at_beginning_of_macro_argument); - for (const SourceRange &Range : InitLists) + for (SourceRange Range : InitLists) DB << Range; } return nullptr; @@ -880,7 +880,7 @@ MacroArgs *Preprocessor::ReadFunctionLikeMacroArgs(Token &MacroName, return nullptr; DiagnosticBuilder DB = Diag(MacroName, diag::note_suggest_parens_for_macro); - for (const SourceRange &ParenLocation : ParenHints) { + for (SourceRange ParenLocation : ParenHints) { DB << FixItHint::CreateInsertion(ParenLocation.getBegin(), "("); DB << FixItHint::CreateInsertion(ParenLocation.getEnd(), ")"); } diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp index 5e59d5dba2..05bf3504e3 100644 --- a/lib/Parse/ParseDeclCXX.cpp +++ b/lib/Parse/ParseDeclCXX.cpp @@ -3419,7 +3419,7 @@ Parser::tryParseExceptionSpecification(bool Delayed, } static void diagnoseDynamicExceptionSpecification( - Parser &P, const SourceRange &Range, bool IsNoexcept) { + Parser &P, SourceRange Range, bool IsNoexcept) { if (P.getLangOpts().CPlusPlus11) { const char *Replacement = IsNoexcept ? "noexcept" : "noexcept(false)"; P.Diag(Range.getBegin(), diag::warn_exception_spec_deprecated) << Range; diff --git a/lib/Sema/SemaCast.cpp b/lib/Sema/SemaCast.cpp index fa41499089..d87be3b0ae 100644 --- a/lib/Sema/SemaCast.cpp +++ b/lib/Sema/SemaCast.cpp @@ -160,19 +160,19 @@ static TryCastResult TryLValueToRValueCast(Sema &Self, Expr *SrcExpr, unsigned &msg); static TryCastResult TryStaticReferenceDowncast(Sema &Self, Expr *SrcExpr, QualType DestType, bool CStyle, - const SourceRange &OpRange, + SourceRange OpRange, unsigned &msg, CastKind &Kind, CXXCastPath &BasePath); static TryCastResult TryStaticPointerDowncast(Sema &Self, QualType SrcType, QualType DestType, bool CStyle, - const SourceRange &OpRange, + SourceRange OpRange, unsigned &msg, CastKind &Kind, CXXCastPath &BasePath); static TryCastResult TryStaticDowncast(Sema &Self, CanQualType SrcType, CanQualType DestType, bool CStyle, - const SourceRange &OpRange, + SourceRange OpRange, QualType OrigSrcType, QualType OrigDestType, unsigned &msg, CastKind &Kind, @@ -180,7 +180,7 @@ static TryCastResult TryStaticDowncast(Sema &Self, CanQualType SrcType, static TryCastResult TryStaticMemberPointerUpcast(Sema &Self, ExprResult &SrcExpr, QualType SrcType, QualType DestType,bool CStyle, - const SourceRange &OpRange, + SourceRange OpRange, unsigned &msg, CastKind &Kind, CXXCastPath &BasePath); @@ -188,13 +188,13 @@ static TryCastResult TryStaticMemberPointerUpcast(Sema &Self, ExprResult &SrcExp static TryCastResult TryStaticImplicitCast(Sema &Self, ExprResult &SrcExpr, QualType DestType, Sema::CheckedConversionKind CCK, - const SourceRange &OpRange, + SourceRange OpRange, unsigned &msg, CastKind &Kind, bool ListInitialization); static TryCastResult TryStaticCast(Sema &Self, ExprResult &SrcExpr, QualType DestType, Sema::CheckedConversionKind CCK, - const SourceRange &OpRange, + SourceRange OpRange, unsigned &msg, CastKind &Kind, CXXCastPath &BasePath, bool ListInitialization); @@ -203,7 +203,7 @@ static TryCastResult TryConstCast(Sema &Self, ExprResult &SrcExpr, unsigned &msg); static TryCastResult TryReinterpretCast(Sema &Self, ExprResult &SrcExpr, QualType DestType, bool CStyle, - const SourceRange &OpRange, + SourceRange OpRange, unsigned &msg, CastKind &Kind); @@ -943,7 +943,7 @@ void CastOperation::CheckStaticCast() { static TryCastResult TryStaticCast(Sema &Self, ExprResult &SrcExpr, QualType DestType, Sema::CheckedConversionKind CCK, - const SourceRange &OpRange, unsigned &msg, + SourceRange OpRange, unsigned &msg, CastKind &Kind, CXXCastPath &BasePath, bool ListInitialization) { // Determine whether we have the semantics of a C-style cast. @@ -1184,7 +1184,7 @@ TryLValueToRValueCast(Sema &Self, Expr *SrcExpr, QualType DestType, /// Tests whether a conversion according to C++ 5.2.9p5 is valid. TryCastResult TryStaticReferenceDowncast(Sema &Self, Expr *SrcExpr, QualType DestType, - bool CStyle, const SourceRange &OpRange, + bool CStyle, SourceRange OpRange, unsigned &msg, CastKind &Kind, CXXCastPath &BasePath) { // C++ 5.2.9p5: An lvalue of type "cv1 B", where B is a class type, can be @@ -1222,7 +1222,7 @@ TryStaticReferenceDowncast(Sema &Self, Expr *SrcExpr, QualType DestType, /// Tests whether a conversion according to C++ 5.2.9p8 is valid. TryCastResult TryStaticPointerDowncast(Sema &Self, QualType SrcType, QualType DestType, - bool CStyle, const SourceRange &OpRange, + bool CStyle, SourceRange OpRange, unsigned &msg, CastKind &Kind, CXXCastPath &BasePath) { // C++ 5.2.9p8: An rvalue of type "pointer to cv1 B", where B is a class @@ -1256,7 +1256,7 @@ TryStaticPointerDowncast(Sema &Self, QualType SrcType, QualType DestType, /// DestType is possible and allowed. TryCastResult TryStaticDowncast(Sema &Self, CanQualType SrcType, CanQualType DestType, - bool CStyle, const SourceRange &OpRange, QualType OrigSrcType, + bool CStyle, SourceRange OpRange, QualType OrigSrcType, QualType OrigDestType, unsigned &msg, CastKind &Kind, CXXCastPath &BasePath) { // We can only work with complete types. But don't complain if it doesn't work @@ -1372,7 +1372,7 @@ TryStaticDowncast(Sema &Self, CanQualType SrcType, CanQualType DestType, TryCastResult TryStaticMemberPointerUpcast(Sema &Self, ExprResult &SrcExpr, QualType SrcType, QualType DestType, bool CStyle, - const SourceRange &OpRange, + SourceRange OpRange, unsigned &msg, CastKind &Kind, CXXCastPath &BasePath) { const MemberPointerType *DestMemPtr = DestType->getAs(); @@ -1486,7 +1486,7 @@ TryStaticMemberPointerUpcast(Sema &Self, ExprResult &SrcExpr, QualType SrcType, TryCastResult TryStaticImplicitCast(Sema &Self, ExprResult &SrcExpr, QualType DestType, Sema::CheckedConversionKind CCK, - const SourceRange &OpRange, unsigned &msg, + SourceRange OpRange, unsigned &msg, CastKind &Kind, bool ListInitialization) { if (DestType->isRecordType()) { if (Self.RequireCompleteType(OpRange.getBegin(), DestType, @@ -1748,7 +1748,7 @@ static void checkIntToPointerCast(bool CStyle, SourceLocation Loc, static TryCastResult TryReinterpretCast(Sema &Self, ExprResult &SrcExpr, QualType DestType, bool CStyle, - const SourceRange &OpRange, + SourceRange OpRange, unsigned &msg, CastKind &Kind) { bool IsLValueCast = false; diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index 7617c92e4e..588ae3d88e 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -6913,7 +6913,7 @@ QualType Sema::CheckDestructorDeclarator(Declarator &D, QualType R, return Context.getFunctionType(Context.VoidTy, None, EPI); } -static void extendLeft(SourceRange &R, const SourceRange &Before) { +static void extendLeft(SourceRange &R, SourceRange Before) { if (Before.isInvalid()) return; R.setBegin(Before.getBegin()); @@ -6921,7 +6921,7 @@ static void extendLeft(SourceRange &R, const SourceRange &Before) { R.setEnd(Before.getEnd()); } -static void extendRight(SourceRange &R, const SourceRange &After) { +static void extendRight(SourceRange &R, SourceRange After) { if (After.isInvalid()) return; if (R.getBegin().isInvalid()) diff --git a/lib/Sema/SemaExceptionSpec.cpp b/lib/Sema/SemaExceptionSpec.cpp index e8d60d8b9c..a4356f6941 100644 --- a/lib/Sema/SemaExceptionSpec.cpp +++ b/lib/Sema/SemaExceptionSpec.cpp @@ -68,7 +68,7 @@ bool Sema::isLibstdcxxEagerExceptionSpecHack(const Declarator &D) { /// /// \param[in,out] T The exception type. This will be decayed to a pointer type /// when the input is an array or a function type. -bool Sema::CheckSpecifiedExceptionType(QualType &T, const SourceRange &Range) { +bool Sema::CheckSpecifiedExceptionType(QualType &T, SourceRange Range) { // C++11 [except.spec]p2: // A type cv T, "array of T", or "function returning T" denoted // in an exception-specification is adjusted to type T, "pointer to T", or diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 0aa9a6c53c..88ed127f3b 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -3852,7 +3852,7 @@ Sema::CreateUnaryExprOrTypeTraitExpr(Expr *E, SourceLocation OpLoc, ExprResult Sema::ActOnUnaryExprOrTypeTraitExpr(SourceLocation OpLoc, UnaryExprOrTypeTrait ExprKind, bool IsType, - void *TyOrEx, const SourceRange &ArgRange) { + void *TyOrEx, SourceRange ArgRange) { // If error parsing type, ignore. if (!TyOrEx) return ExprError(); diff --git a/lib/Sema/SemaOpenMP.cpp b/lib/Sema/SemaOpenMP.cpp index ae146a3810..3fe9100d88 100644 --- a/lib/Sema/SemaOpenMP.cpp +++ b/lib/Sema/SemaOpenMP.cpp @@ -2455,7 +2455,7 @@ private: /// \brief Helper to set loop counter variable and its initializer. bool SetVarAndLB(VarDecl *NewVar, DeclRefExpr *NewVarRefExpr, Expr *NewLB); /// \brief Helper to set upper bound. - bool SetUB(Expr *NewUB, bool LessOp, bool StrictOp, const SourceRange &SR, + bool SetUB(Expr *NewUB, bool LessOp, bool StrictOp, SourceRange SR, SourceLocation SL); /// \brief Helper to set loop increment. bool SetStep(Expr *NewStep, bool Subtract); @@ -2507,8 +2507,7 @@ bool OpenMPIterationSpaceChecker::SetVarAndLB(VarDecl *NewVar, } bool OpenMPIterationSpaceChecker::SetUB(Expr *NewUB, bool LessOp, bool StrictOp, - const SourceRange &SR, - SourceLocation SL) { + SourceRange SR, SourceLocation SL) { // State consistency checking to ensure correct usage. assert(Var != nullptr && LB != nullptr && UB == nullptr && Step == nullptr && !TestIsLessOp && !TestIsStrictOp); diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp index 49d89c86b7..03b35ec985 100644 --- a/lib/Sema/SemaOverload.cpp +++ b/lib/Sema/SemaOverload.cpp @@ -10365,7 +10365,7 @@ Sema::ResolveSingleFunctionTemplateSpecialization(OverloadExpr *ovl, // returns true if 'complain' is set. bool Sema::ResolveAndFixSingleFunctionTemplateSpecialization( ExprResult &SrcExpr, bool doFunctionPointerConverion, - bool complain, const SourceRange& OpRangeForComplaining, + bool complain, SourceRange OpRangeForComplaining, QualType DestTypeForComplaining, unsigned DiagIDForComplaining) { assert(SrcExpr.get()->getType() == Context.OverloadTy); diff --git a/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp b/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp index 750cbda459..d2e54ee180 100644 --- a/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp +++ b/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp @@ -89,7 +89,7 @@ private: BT.reset(new BuiltinBug(this, desc)); } bool uninitRefOrPointer(CheckerContext &C, const SVal &V, - const SourceRange &ArgRange, + SourceRange ArgRange, const Expr *ArgEx, std::unique_ptr &BT, const ParmVarDecl *ParamDecl, const char *BD) const; }; @@ -138,7 +138,7 @@ static StringRef describeUninitializedArgumentInCall(const CallEvent &Call, bool CallAndMessageChecker::uninitRefOrPointer(CheckerContext &C, const SVal &V, - const SourceRange &ArgRange, + SourceRange ArgRange, const Expr *ArgEx, std::unique_ptr &BT, const ParmVarDecl *ParamDecl, diff --git a/lib/StaticAnalyzer/Core/BugReporter.cpp b/lib/StaticAnalyzer/Core/BugReporter.cpp index f70a7d04ae..56d57c5014 100644 --- a/lib/StaticAnalyzer/Core/BugReporter.cpp +++ b/lib/StaticAnalyzer/Core/BugReporter.cpp @@ -2579,9 +2579,7 @@ void BugReport::Profile(llvm::FoldingSetNodeID& hash) const { hash.AddPointer(GetCurrentOrPreviousStmt(ErrorNode)); } - for (SmallVectorImpl::const_iterator I = - Ranges.begin(), E = Ranges.end(); I != E; ++I) { - const SourceRange range = *I; + for (SourceRange range : Ranges) { if (!range.isValid()) continue; hash.AddInteger(range.getBegin().getRawEncoding()); @@ -3431,7 +3429,7 @@ void BugReporter::FlushReport(BugReport *exampleReport, PathDiagnosticLocation L = exampleReport->getLocation(getSourceManager()); auto piece = llvm::make_unique( L, exampleReport->getDescription()); - for (const SourceRange &Range : exampleReport->getRanges()) + for (SourceRange Range : exampleReport->getRanges()) piece->addRange(Range); D->setEndOfPath(std::move(piece)); } diff --git a/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp b/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp index 9bd236ad6e..ec1310d918 100644 --- a/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp +++ b/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp @@ -117,7 +117,7 @@ std::unique_ptr BugReporterVisitor::getDefaultEndPath( // special ranges for this report. auto P = llvm::make_unique( L, BR.getDescription(), Ranges.begin() == Ranges.end()); - for (const SourceRange &Range : Ranges) + for (SourceRange Range : Ranges) P->addRange(Range); return std::move(P); diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp index 127c216204..7a1fb5b966 100644 --- a/tools/libclang/CIndex.cpp +++ b/tools/libclang/CIndex.cpp @@ -2830,7 +2830,7 @@ namespace { typedef SmallVector RefNamePieces; RefNamePieces buildPieces(unsigned NameFlags, bool IsMemberRefExpr, - const DeclarationNameInfo &NI, const SourceRange &QLoc, + const DeclarationNameInfo &NI, SourceRange QLoc, const ASTTemplateArgumentListInfo *TemplateArgs = nullptr) { const bool WantQualifier = NameFlags & CXNameRange_WantQualifier; const bool WantTemplateArgs = NameFlags & CXNameRange_WantTemplateArgs; -- 2.40.0