Re: [clang] e5c7c17 - [clang] Rename StringRef _lower() method calls to _insensitive()
Ah, found it in https://reviews.llvm.org/D104819 - good to leave that in in the "Differential Revision: " part of the commit message (or if you end up splitting patches off from a review, such that it doesn't necessarily make sense for it to close the review (preparatory patches, etc) then linking to the review without the "Differential Revision: " prefix and/or linking to a design discussion, etc). All good - thanks for the renaming! On Mon, Jun 28, 2021 at 11:38 AM David Blaikie wrote: > Was this design/code reviewed (there's no mention in the commit message of > a link to a phab review, for instance)? Probably worth some discussion - if > there was a review, could you link it here in a reply? > > On Thu, Jun 24, 2021 at 2:23 PM Martin Storsjö via cfe-commits < > cfe-commits@lists.llvm.org> wrote: > >> >> Author: Martin Storsjö >> Date: 2021-06-25T00:22:01+03:00 >> New Revision: e5c7c171e5db6af1e3dca1059df4287b0d147eaf >> >> URL: >> https://github.com/llvm/llvm-project/commit/e5c7c171e5db6af1e3dca1059df4287b0d147eaf >> DIFF: >> https://github.com/llvm/llvm-project/commit/e5c7c171e5db6af1e3dca1059df4287b0d147eaf.diff >> >> LOG: [clang] Rename StringRef _lower() method calls to _insensitive() >> >> This is mostly a mechanical change, but a testcase that contains >> parts of the StringRef class (clang/test/Analysis/llvm-conventions.cpp) >> isn't touched. >> >> Added: >> >> >> Modified: >> clang/lib/ASTMatchers/Dynamic/Marshallers.cpp >> clang/lib/Analysis/CalledOnceCheck.cpp >> clang/lib/Analysis/RetainSummaryManager.cpp >> clang/lib/Basic/FileManager.cpp >> clang/lib/CodeGen/TargetInfo.cpp >> clang/lib/Driver/Driver.cpp >> clang/lib/Driver/ToolChains/Arch/RISCV.cpp >> clang/lib/Driver/ToolChains/Clang.cpp >> clang/lib/Driver/ToolChains/Fuchsia.cpp >> clang/lib/Driver/ToolChains/Gnu.cpp >> clang/lib/Driver/ToolChains/Hexagon.cpp >> clang/lib/Driver/ToolChains/MSVC.cpp >> clang/lib/Driver/ToolChains/MinGW.cpp >> clang/lib/Format/Format.cpp >> clang/lib/Format/SortJavaScriptImports.cpp >> clang/lib/Format/UsingDeclarationsSorter.cpp >> clang/lib/Frontend/CompilerInvocation.cpp >> clang/lib/Lex/HeaderMap.cpp >> clang/lib/Lex/PPDirectives.cpp >> clang/lib/Lex/PPMacroExpansion.cpp >> clang/lib/Sema/CodeCompleteConsumer.cpp >> clang/lib/Sema/SemaChecking.cpp >> clang/lib/Sema/SemaCodeComplete.cpp >> clang/lib/StaticAnalyzer/Checkers/CStringChecker.cpp >> clang/lib/StaticAnalyzer/Checkers/ContainerModeling.cpp >> clang/lib/StaticAnalyzer/Checkers/GCDAntipatternChecker.cpp >> clang/lib/StaticAnalyzer/Checkers/Iterator.cpp >> clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp >> clang/lib/Tooling/Inclusions/HeaderIncludes.cpp >> clang/lib/Tooling/InterpolatingCompilationDatabase.cpp >> clang/tools/clang-refactor/TestSupport.cpp >> clang/tools/clang-scan-deps/ClangScanDeps.cpp >> clang/tools/driver/driver.cpp >> clang/tools/libclang/CIndexCodeCompletion.cpp >> clang/unittests/Tooling/CompilationDatabaseTest.cpp >> >> Removed: >> >> >> >> >> >> diff --git a/clang/lib/ASTMatchers/Dynamic/Marshallers.cpp >> b/clang/lib/ASTMatchers/Dynamic/Marshallers.cpp >> index f6fdbe868e2df..40db70e6f4a51 100644 >> --- a/clang/lib/ASTMatchers/Dynamic/Marshallers.cpp >> +++ b/clang/lib/ASTMatchers/Dynamic/Marshallers.cpp >> @@ -20,7 +20,7 @@ getBestGuess(llvm::StringRef Search, >> llvm::ArrayRef Allowed, >> ++MaxEditDistance; >>llvm::StringRef Res; >>for (const llvm::StringRef : Allowed) { >> -if (Item.equals_lower(Search)) { >> +if (Item.equals_insensitive(Search)) { >>assert(!Item.equals(Search) && "This should be handled earlier >> on."); >>MaxEditDistance = 1; >>Res = Item; >> @@ -40,7 +40,7 @@ getBestGuess(llvm::StringRef Search, >> llvm::ArrayRef Allowed, >>auto NoPrefix = Item; >>if (!NoPrefix.consume_front(DropPrefix)) >> continue; >> - if (NoPrefix.equals_lower(Search)) { >> + if (NoPrefix.equals_insensitive(Search)) { >> if (NoPrefix.equals(Search)) >>return Item.str(); >> MaxEditDistance = 1; >> >> diff --git a/clang/lib/Analysis/CalledOnceCheck.cpp >> b/clang/lib/Analysis/CalledOnceCheck.cpp >> index db094129a9608..661f7b999f2b9 100644 >> --- a/clang/lib/Analysis/CalledOnceCheck.cpp >> +++ b/clang/lib/Analysis/CalledOnceCheck.cpp >> @@ -478,7 +478,7 @@ bool mentionsAnyOfConventionalNames(const Expr *E) { >> return llvm::any_of( >> CONVENTIONAL_CONDITIONS, >> [ConditionName](const llvm::StringLiteral ) { >> - return ConditionName.contains_lower(Conventional); >> + return ConditionName.contains_insensitive(Conventional); >> }); >>}); >> } >> >> diff --git a/clang/lib/Analysis/RetainSummaryManager.cpp >>
Re: [clang] e5c7c17 - [clang] Rename StringRef _lower() method calls to _insensitive()
Was this design/code reviewed (there's no mention in the commit message of a link to a phab review, for instance)? Probably worth some discussion - if there was a review, could you link it here in a reply? On Thu, Jun 24, 2021 at 2:23 PM Martin Storsjö via cfe-commits < cfe-commits@lists.llvm.org> wrote: > > Author: Martin Storsjö > Date: 2021-06-25T00:22:01+03:00 > New Revision: e5c7c171e5db6af1e3dca1059df4287b0d147eaf > > URL: > https://github.com/llvm/llvm-project/commit/e5c7c171e5db6af1e3dca1059df4287b0d147eaf > DIFF: > https://github.com/llvm/llvm-project/commit/e5c7c171e5db6af1e3dca1059df4287b0d147eaf.diff > > LOG: [clang] Rename StringRef _lower() method calls to _insensitive() > > This is mostly a mechanical change, but a testcase that contains > parts of the StringRef class (clang/test/Analysis/llvm-conventions.cpp) > isn't touched. > > Added: > > > Modified: > clang/lib/ASTMatchers/Dynamic/Marshallers.cpp > clang/lib/Analysis/CalledOnceCheck.cpp > clang/lib/Analysis/RetainSummaryManager.cpp > clang/lib/Basic/FileManager.cpp > clang/lib/CodeGen/TargetInfo.cpp > clang/lib/Driver/Driver.cpp > clang/lib/Driver/ToolChains/Arch/RISCV.cpp > clang/lib/Driver/ToolChains/Clang.cpp > clang/lib/Driver/ToolChains/Fuchsia.cpp > clang/lib/Driver/ToolChains/Gnu.cpp > clang/lib/Driver/ToolChains/Hexagon.cpp > clang/lib/Driver/ToolChains/MSVC.cpp > clang/lib/Driver/ToolChains/MinGW.cpp > clang/lib/Format/Format.cpp > clang/lib/Format/SortJavaScriptImports.cpp > clang/lib/Format/UsingDeclarationsSorter.cpp > clang/lib/Frontend/CompilerInvocation.cpp > clang/lib/Lex/HeaderMap.cpp > clang/lib/Lex/PPDirectives.cpp > clang/lib/Lex/PPMacroExpansion.cpp > clang/lib/Sema/CodeCompleteConsumer.cpp > clang/lib/Sema/SemaChecking.cpp > clang/lib/Sema/SemaCodeComplete.cpp > clang/lib/StaticAnalyzer/Checkers/CStringChecker.cpp > clang/lib/StaticAnalyzer/Checkers/ContainerModeling.cpp > clang/lib/StaticAnalyzer/Checkers/GCDAntipatternChecker.cpp > clang/lib/StaticAnalyzer/Checkers/Iterator.cpp > clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp > clang/lib/Tooling/Inclusions/HeaderIncludes.cpp > clang/lib/Tooling/InterpolatingCompilationDatabase.cpp > clang/tools/clang-refactor/TestSupport.cpp > clang/tools/clang-scan-deps/ClangScanDeps.cpp > clang/tools/driver/driver.cpp > clang/tools/libclang/CIndexCodeCompletion.cpp > clang/unittests/Tooling/CompilationDatabaseTest.cpp > > Removed: > > > > > > diff --git a/clang/lib/ASTMatchers/Dynamic/Marshallers.cpp > b/clang/lib/ASTMatchers/Dynamic/Marshallers.cpp > index f6fdbe868e2df..40db70e6f4a51 100644 > --- a/clang/lib/ASTMatchers/Dynamic/Marshallers.cpp > +++ b/clang/lib/ASTMatchers/Dynamic/Marshallers.cpp > @@ -20,7 +20,7 @@ getBestGuess(llvm::StringRef Search, > llvm::ArrayRef Allowed, > ++MaxEditDistance; >llvm::StringRef Res; >for (const llvm::StringRef : Allowed) { > -if (Item.equals_lower(Search)) { > +if (Item.equals_insensitive(Search)) { >assert(!Item.equals(Search) && "This should be handled earlier > on."); >MaxEditDistance = 1; >Res = Item; > @@ -40,7 +40,7 @@ getBestGuess(llvm::StringRef Search, > llvm::ArrayRef Allowed, >auto NoPrefix = Item; >if (!NoPrefix.consume_front(DropPrefix)) > continue; > - if (NoPrefix.equals_lower(Search)) { > + if (NoPrefix.equals_insensitive(Search)) { > if (NoPrefix.equals(Search)) >return Item.str(); > MaxEditDistance = 1; > > diff --git a/clang/lib/Analysis/CalledOnceCheck.cpp > b/clang/lib/Analysis/CalledOnceCheck.cpp > index db094129a9608..661f7b999f2b9 100644 > --- a/clang/lib/Analysis/CalledOnceCheck.cpp > +++ b/clang/lib/Analysis/CalledOnceCheck.cpp > @@ -478,7 +478,7 @@ bool mentionsAnyOfConventionalNames(const Expr *E) { > return llvm::any_of( > CONVENTIONAL_CONDITIONS, > [ConditionName](const llvm::StringLiteral ) { > - return ConditionName.contains_lower(Conventional); > + return ConditionName.contains_insensitive(Conventional); > }); >}); > } > > diff --git a/clang/lib/Analysis/RetainSummaryManager.cpp > b/clang/lib/Analysis/RetainSummaryManager.cpp > index 58ead1dfe3522..7ed1e40333f43 100644 > --- a/clang/lib/Analysis/RetainSummaryManager.cpp > +++ b/clang/lib/Analysis/RetainSummaryManager.cpp > @@ -189,20 +189,22 @@ static bool hasRCAnnotation(const Decl *D, StringRef > rcAnnotation) { > } > > static bool isRetain(const FunctionDecl *FD, StringRef FName) { > - return FName.startswith_lower("retain") || > FName.endswith_lower("retain"); > + return FName.startswith_insensitive("retain") || > + FName.endswith_insensitive("retain"); > } > > static bool isRelease(const FunctionDecl *FD, StringRef FName) { > - return
[clang] e5c7c17 - [clang] Rename StringRef _lower() method calls to _insensitive()
Author: Martin Storsjö Date: 2021-06-25T00:22:01+03:00 New Revision: e5c7c171e5db6af1e3dca1059df4287b0d147eaf URL: https://github.com/llvm/llvm-project/commit/e5c7c171e5db6af1e3dca1059df4287b0d147eaf DIFF: https://github.com/llvm/llvm-project/commit/e5c7c171e5db6af1e3dca1059df4287b0d147eaf.diff LOG: [clang] Rename StringRef _lower() method calls to _insensitive() This is mostly a mechanical change, but a testcase that contains parts of the StringRef class (clang/test/Analysis/llvm-conventions.cpp) isn't touched. Added: Modified: clang/lib/ASTMatchers/Dynamic/Marshallers.cpp clang/lib/Analysis/CalledOnceCheck.cpp clang/lib/Analysis/RetainSummaryManager.cpp clang/lib/Basic/FileManager.cpp clang/lib/CodeGen/TargetInfo.cpp clang/lib/Driver/Driver.cpp clang/lib/Driver/ToolChains/Arch/RISCV.cpp clang/lib/Driver/ToolChains/Clang.cpp clang/lib/Driver/ToolChains/Fuchsia.cpp clang/lib/Driver/ToolChains/Gnu.cpp clang/lib/Driver/ToolChains/Hexagon.cpp clang/lib/Driver/ToolChains/MSVC.cpp clang/lib/Driver/ToolChains/MinGW.cpp clang/lib/Format/Format.cpp clang/lib/Format/SortJavaScriptImports.cpp clang/lib/Format/UsingDeclarationsSorter.cpp clang/lib/Frontend/CompilerInvocation.cpp clang/lib/Lex/HeaderMap.cpp clang/lib/Lex/PPDirectives.cpp clang/lib/Lex/PPMacroExpansion.cpp clang/lib/Sema/CodeCompleteConsumer.cpp clang/lib/Sema/SemaChecking.cpp clang/lib/Sema/SemaCodeComplete.cpp clang/lib/StaticAnalyzer/Checkers/CStringChecker.cpp clang/lib/StaticAnalyzer/Checkers/ContainerModeling.cpp clang/lib/StaticAnalyzer/Checkers/GCDAntipatternChecker.cpp clang/lib/StaticAnalyzer/Checkers/Iterator.cpp clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp clang/lib/Tooling/Inclusions/HeaderIncludes.cpp clang/lib/Tooling/InterpolatingCompilationDatabase.cpp clang/tools/clang-refactor/TestSupport.cpp clang/tools/clang-scan-deps/ClangScanDeps.cpp clang/tools/driver/driver.cpp clang/tools/libclang/CIndexCodeCompletion.cpp clang/unittests/Tooling/CompilationDatabaseTest.cpp Removed: diff --git a/clang/lib/ASTMatchers/Dynamic/Marshallers.cpp b/clang/lib/ASTMatchers/Dynamic/Marshallers.cpp index f6fdbe868e2df..40db70e6f4a51 100644 --- a/clang/lib/ASTMatchers/Dynamic/Marshallers.cpp +++ b/clang/lib/ASTMatchers/Dynamic/Marshallers.cpp @@ -20,7 +20,7 @@ getBestGuess(llvm::StringRef Search, llvm::ArrayRef Allowed, ++MaxEditDistance; llvm::StringRef Res; for (const llvm::StringRef : Allowed) { -if (Item.equals_lower(Search)) { +if (Item.equals_insensitive(Search)) { assert(!Item.equals(Search) && "This should be handled earlier on."); MaxEditDistance = 1; Res = Item; @@ -40,7 +40,7 @@ getBestGuess(llvm::StringRef Search, llvm::ArrayRef Allowed, auto NoPrefix = Item; if (!NoPrefix.consume_front(DropPrefix)) continue; - if (NoPrefix.equals_lower(Search)) { + if (NoPrefix.equals_insensitive(Search)) { if (NoPrefix.equals(Search)) return Item.str(); MaxEditDistance = 1; diff --git a/clang/lib/Analysis/CalledOnceCheck.cpp b/clang/lib/Analysis/CalledOnceCheck.cpp index db094129a9608..661f7b999f2b9 100644 --- a/clang/lib/Analysis/CalledOnceCheck.cpp +++ b/clang/lib/Analysis/CalledOnceCheck.cpp @@ -478,7 +478,7 @@ bool mentionsAnyOfConventionalNames(const Expr *E) { return llvm::any_of( CONVENTIONAL_CONDITIONS, [ConditionName](const llvm::StringLiteral ) { - return ConditionName.contains_lower(Conventional); + return ConditionName.contains_insensitive(Conventional); }); }); } diff --git a/clang/lib/Analysis/RetainSummaryManager.cpp b/clang/lib/Analysis/RetainSummaryManager.cpp index 58ead1dfe3522..7ed1e40333f43 100644 --- a/clang/lib/Analysis/RetainSummaryManager.cpp +++ b/clang/lib/Analysis/RetainSummaryManager.cpp @@ -189,20 +189,22 @@ static bool hasRCAnnotation(const Decl *D, StringRef rcAnnotation) { } static bool isRetain(const FunctionDecl *FD, StringRef FName) { - return FName.startswith_lower("retain") || FName.endswith_lower("retain"); + return FName.startswith_insensitive("retain") || + FName.endswith_insensitive("retain"); } static bool isRelease(const FunctionDecl *FD, StringRef FName) { - return FName.startswith_lower("release") || FName.endswith_lower("release"); + return FName.startswith_insensitive("release") || + FName.endswith_insensitive("release"); } static bool isAutorelease(const FunctionDecl *FD, StringRef FName) { - return FName.startswith_lower("autorelease") || - FName.endswith_lower("autorelease"); + return FName.startswith_insensitive("autorelease") || + FName.endswith_insensitive("autorelease"); } static bool isMakeCollectable(StringRef FName) { - return