[clang] [clang] Use StringRef::operator== instead of StringRef::equals (NFC) (PR #91844)

2024-05-11 Thread Kazu Hirata via cfe-commits 

https://github.com/kazutakahirata closed 
https://github.com/llvm/llvm-project/pull/91844
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [clang] Use StringRef::operator== instead of StringRef::equals (NFC) (PR #91844)

2024-05-11 Thread Fangrui Song via cfe-commits 

https://github.com/MaskRay approved this pull request.


https://github.com/llvm/llvm-project/pull/91844
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [clang] Use StringRef::operator== instead of StringRef::equals (NFC) (PR #91844)

2024-05-11 Thread via cfe-commits 

llvmbot wrote:



@llvm/pr-subscribers-clang-codegen

@llvm/pr-subscribers-backend-systemz

Author: Kazu Hirata (kazutakahirata)


Changes

I'm planning to remove StringRef::equals in favor of
StringRef::operator==.

- StringRef::operator==/!= outnumber StringRef::equals by a factor of
  24 under clang/ in terms of their usage.

- The elimination of StringRef::equals brings StringRef closer to
  std::string_view, which has operator== but not equals.

- S == "foo" is more readable than S.equals("foo"), especially for
  !Long.Expression.equals("str") vs Long.Expression != "str".

---

Patch is 31.89 KiB, truncated to 20.00 KiB below, full version: 
https://github.com/llvm/llvm-project/pull/91844.diff


39 Files Affected:

- (modified) clang/include/clang/Basic/IdentifierTable.h (+1-1) 
- (modified) clang/include/clang/Basic/SourceManager.h (+3-3) 
- (modified) clang/lib/ARCMigrate/ObjCMT.cpp (+1-1) 
- (modified) clang/lib/AST/PrintfFormatString.cpp (+4-4) 
- (modified) clang/lib/ASTMatchers/Dynamic/Marshallers.cpp (+2-2) 
- (modified) clang/lib/Basic/Builtins.cpp (+1-1) 
- (modified) clang/lib/Basic/Diagnostic.cpp (+1-2) 
- (modified) clang/lib/Basic/LangOptions.cpp (+1-1) 
- (modified) clang/lib/Basic/Targets/ARM.cpp (+2-3) 
- (modified) clang/lib/Basic/Targets/PPC.h (+1-1) 
- (modified) clang/lib/Basic/Targets/SystemZ.h (+1-1) 
- (modified) clang/lib/Basic/Targets/X86.h (+3-3) 
- (modified) clang/lib/CodeGen/CodeGenFunction.cpp (+3-4) 
- (modified) clang/lib/Format/ContinuationIndenter.cpp (+1-1) 
- (modified) clang/lib/Format/Format.cpp (+1-1) 
- (modified) clang/lib/Frontend/CompilerInvocation.cpp (+1-1) 
- (modified) clang/lib/Frontend/ModuleDependencyCollector.cpp (+1-1) 
- (modified) clang/lib/Lex/PPDirectives.cpp (+2-2) 
- (modified) clang/lib/Parse/ParseDecl.cpp (+1-1) 
- (modified) clang/lib/Parse/ParseDeclCXX.cpp (+2-2) 
- (modified) clang/lib/Parse/ParseHLSL.cpp (+1-1) 
- (modified) clang/lib/Parse/ParseOpenMP.cpp (+2-2) 
- (modified) clang/lib/Sema/SemaCodeComplete.cpp (+4-5) 
- (modified) clang/lib/Sema/SemaDecl.cpp (+4-4) 
- (modified) clang/lib/Sema/SemaDeclCXX.cpp (+2-2) 
- (modified) clang/lib/Sema/SemaStmtAsm.cpp (+1-1) 
- (modified) clang/lib/Sema/SemaTemplate.cpp (+2-2) 
- (modified) clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp (+3-4) 
- (modified) clang/lib/StaticAnalyzer/Checkers/LLVMConventionsChecker.cpp 
(+1-1) 
- (modified) clang/lib/StaticAnalyzer/Checkers/LocalizationChecker.cpp (+1-1) 
- (modified) clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp (+2-2) 
- (modified) clang/lib/StaticAnalyzer/Checkers/ObjCContainersASTChecker.cpp 
(+2-2) 
- (modified) clang/lib/StaticAnalyzer/Checkers/ObjCContainersChecker.cpp (+3-3) 
- (modified) clang/lib/StaticAnalyzer/Checkers/StreamChecker.cpp (+1-1) 
- (modified) clang/lib/StaticAnalyzer/Core/CheckerContext.cpp (+1-1) 
- (modified) clang/lib/Tooling/Tooling.cpp (+1-1) 
- (modified) clang/tools/diagtool/ShowEnabledWarnings.cpp (+2-2) 
- (modified) clang/tools/diagtool/TreeView.cpp (+1-1) 
- (modified) clang/unittests/CodeGen/IRMatchers.h (+1-1) 


``diff
diff --git a/clang/include/clang/Basic/IdentifierTable.h 
b/clang/include/clang/Basic/IdentifierTable.h
index a893e6f4d3d39..ae9ebd9f59154 100644
--- a/clang/include/clang/Basic/IdentifierTable.h
+++ b/clang/include/clang/Basic/IdentifierTable.h
@@ -738,7 +738,7 @@ class IdentifierTable {
 II->Entry = 
 
 // If this is the 'import' contextual keyword, mark it as such.
-if (Name.equals("import"))
+if (Name == "import")
   II->setModulesImport(true);
 
 return *II;
diff --git a/clang/include/clang/Basic/SourceManager.h 
b/clang/include/clang/Basic/SourceManager.h
index d2ece14da0b11..5258bab584f49 100644
--- a/clang/include/clang/Basic/SourceManager.h
+++ b/clang/include/clang/Basic/SourceManager.h
@@ -1504,7 +1504,7 @@ class SourceManager : public 
RefCountedBase {
 if (Presumed.isInvalid())
   return false;
 StringRef Filename(Presumed.getFilename());
-return Filename.equals("");
+return Filename == "";
   }
 
   /// Returns whether \p Loc is located in a  file.
@@ -1513,7 +1513,7 @@ class SourceManager : public 
RefCountedBase {
 if (Presumed.isInvalid())
   return false;
 StringRef Filename(Presumed.getFilename());
-return Filename.equals("");
+return Filename == "";
   }
 
   /// Returns whether \p Loc is located in a  file.
@@ -1522,7 +1522,7 @@ class SourceManager : public 
RefCountedBase {
 if (Presumed.isInvalid())
   return false;
 StringRef Filename(Presumed.getFilename());
-return Filename.equals("");
+return Filename == "";
   }
 
   /// Returns if a SourceLocation is in a system header.
diff --git a/clang/lib/ARCMigrate/ObjCMT.cpp b/clang/lib/ARCMigrate/ObjCMT.cpp
index b9dcfb8951b3e..aaf41dc4039cd 100644
--- a/clang/lib/ARCMigrate/ObjCMT.cpp
+++ b/clang/lib/ARCMigrate/ObjCMT.cpp
@@ -484,7 +484,7 @@ static void rewriteToObjCProperty(const ObjCMethodDecl 
*Getter,
 
   //

[clang] [clang] Use StringRef::operator== instead of StringRef::equals (NFC) (PR #91844)

2024-05-11 Thread via cfe-commits 

llvmbot wrote:




@llvm/pr-subscribers-backend-arm

Author: Kazu Hirata (kazutakahirata)


Changes

I'm planning to remove StringRef::equals in favor of
StringRef::operator==.

- StringRef::operator==/!= outnumber StringRef::equals by a factor of
  24 under clang/ in terms of their usage.

- The elimination of StringRef::equals brings StringRef closer to
  std::string_view, which has operator== but not equals.

- S == "foo" is more readable than S.equals("foo"), especially for
  !Long.Expression.equals("str") vs Long.Expression != "str".

---

Patch is 31.89 KiB, truncated to 20.00 KiB below, full version: 
https://github.com/llvm/llvm-project/pull/91844.diff


39 Files Affected:

- (modified) clang/include/clang/Basic/IdentifierTable.h (+1-1) 
- (modified) clang/include/clang/Basic/SourceManager.h (+3-3) 
- (modified) clang/lib/ARCMigrate/ObjCMT.cpp (+1-1) 
- (modified) clang/lib/AST/PrintfFormatString.cpp (+4-4) 
- (modified) clang/lib/ASTMatchers/Dynamic/Marshallers.cpp (+2-2) 
- (modified) clang/lib/Basic/Builtins.cpp (+1-1) 
- (modified) clang/lib/Basic/Diagnostic.cpp (+1-2) 
- (modified) clang/lib/Basic/LangOptions.cpp (+1-1) 
- (modified) clang/lib/Basic/Targets/ARM.cpp (+2-3) 
- (modified) clang/lib/Basic/Targets/PPC.h (+1-1) 
- (modified) clang/lib/Basic/Targets/SystemZ.h (+1-1) 
- (modified) clang/lib/Basic/Targets/X86.h (+3-3) 
- (modified) clang/lib/CodeGen/CodeGenFunction.cpp (+3-4) 
- (modified) clang/lib/Format/ContinuationIndenter.cpp (+1-1) 
- (modified) clang/lib/Format/Format.cpp (+1-1) 
- (modified) clang/lib/Frontend/CompilerInvocation.cpp (+1-1) 
- (modified) clang/lib/Frontend/ModuleDependencyCollector.cpp (+1-1) 
- (modified) clang/lib/Lex/PPDirectives.cpp (+2-2) 
- (modified) clang/lib/Parse/ParseDecl.cpp (+1-1) 
- (modified) clang/lib/Parse/ParseDeclCXX.cpp (+2-2) 
- (modified) clang/lib/Parse/ParseHLSL.cpp (+1-1) 
- (modified) clang/lib/Parse/ParseOpenMP.cpp (+2-2) 
- (modified) clang/lib/Sema/SemaCodeComplete.cpp (+4-5) 
- (modified) clang/lib/Sema/SemaDecl.cpp (+4-4) 
- (modified) clang/lib/Sema/SemaDeclCXX.cpp (+2-2) 
- (modified) clang/lib/Sema/SemaStmtAsm.cpp (+1-1) 
- (modified) clang/lib/Sema/SemaTemplate.cpp (+2-2) 
- (modified) clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp (+3-4) 
- (modified) clang/lib/StaticAnalyzer/Checkers/LLVMConventionsChecker.cpp 
(+1-1) 
- (modified) clang/lib/StaticAnalyzer/Checkers/LocalizationChecker.cpp (+1-1) 
- (modified) clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp (+2-2) 
- (modified) clang/lib/StaticAnalyzer/Checkers/ObjCContainersASTChecker.cpp 
(+2-2) 
- (modified) clang/lib/StaticAnalyzer/Checkers/ObjCContainersChecker.cpp (+3-3) 
- (modified) clang/lib/StaticAnalyzer/Checkers/StreamChecker.cpp (+1-1) 
- (modified) clang/lib/StaticAnalyzer/Core/CheckerContext.cpp (+1-1) 
- (modified) clang/lib/Tooling/Tooling.cpp (+1-1) 
- (modified) clang/tools/diagtool/ShowEnabledWarnings.cpp (+2-2) 
- (modified) clang/tools/diagtool/TreeView.cpp (+1-1) 
- (modified) clang/unittests/CodeGen/IRMatchers.h (+1-1) 


``diff
diff --git a/clang/include/clang/Basic/IdentifierTable.h 
b/clang/include/clang/Basic/IdentifierTable.h
index a893e6f4d3d39..ae9ebd9f59154 100644
--- a/clang/include/clang/Basic/IdentifierTable.h
+++ b/clang/include/clang/Basic/IdentifierTable.h
@@ -738,7 +738,7 @@ class IdentifierTable {
 II->Entry = 
 
 // If this is the 'import' contextual keyword, mark it as such.
-if (Name.equals("import"))
+if (Name == "import")
   II->setModulesImport(true);
 
 return *II;
diff --git a/clang/include/clang/Basic/SourceManager.h 
b/clang/include/clang/Basic/SourceManager.h
index d2ece14da0b11..5258bab584f49 100644
--- a/clang/include/clang/Basic/SourceManager.h
+++ b/clang/include/clang/Basic/SourceManager.h
@@ -1504,7 +1504,7 @@ class SourceManager : public 
RefCountedBase {
 if (Presumed.isInvalid())
   return false;
 StringRef Filename(Presumed.getFilename());
-return Filename.equals("");
+return Filename == "";
   }
 
   /// Returns whether \p Loc is located in a  file.
@@ -1513,7 +1513,7 @@ class SourceManager : public 
RefCountedBase {
 if (Presumed.isInvalid())
   return false;
 StringRef Filename(Presumed.getFilename());
-return Filename.equals("");
+return Filename == "";
   }
 
   /// Returns whether \p Loc is located in a  file.
@@ -1522,7 +1522,7 @@ class SourceManager : public 
RefCountedBase {
 if (Presumed.isInvalid())
   return false;
 StringRef Filename(Presumed.getFilename());
-return Filename.equals("");
+return Filename == "";
   }
 
   /// Returns if a SourceLocation is in a system header.
diff --git a/clang/lib/ARCMigrate/ObjCMT.cpp b/clang/lib/ARCMigrate/ObjCMT.cpp
index b9dcfb8951b3e..aaf41dc4039cd 100644
--- a/clang/lib/ARCMigrate/ObjCMT.cpp
+++ b/clang/lib/ARCMigrate/ObjCMT.cpp
@@ -484,7 +484,7 @@ static void rewriteToObjCProperty(const ObjCMethodDecl 
*Getter,
 
   // Short circuit 'delegate' properties

[clang] [clang] Use StringRef::operator== instead of StringRef::equals (NFC) (PR #91844)

2024-05-11 Thread Kazu Hirata via cfe-commits 

https://github.com/kazutakahirata created 
https://github.com/llvm/llvm-project/pull/91844

I'm planning to remove StringRef::equals in favor of
StringRef::operator==.

- StringRef::operator==/!= outnumber StringRef::equals by a factor of
  24 under clang/ in terms of their usage.

- The elimination of StringRef::equals brings StringRef closer to
  std::string_view, which has operator== but not equals.

- S == "foo" is more readable than S.equals("foo"), especially for
  !Long.Expression.equals("str") vs Long.Expression != "str".

>From 8b4328567ca3406d63ff21d599cfb787efc81b26 Mon Sep 17 00:00:00 2001
From: Kazu Hirata 
Date: Thu, 9 May 2024 23:15:31 -0700
Subject: [PATCH] [clang] Use StringRef::operator== instead of
 StringRef::equals (NFC)

I'm planning to remove StringRef::equals in favor of
StringRef::operator==.

- StringRef::operator==/!= outnumber StringRef::equals by a factor of
  24 under clang/ in terms of their usage.

- The elimination of StringRef::equals brings StringRef closer to
  std::string_view, which has operator== but not equals.

- S == "foo" is more readable than S.equals("foo"), especially for
  !Long.Expression.equals("str") vs Long.Expression != "str".
---
 clang/include/clang/Basic/IdentifierTable.h  | 2 +-
 clang/include/clang/Basic/SourceManager.h| 6 +++---
 clang/lib/ARCMigrate/ObjCMT.cpp  | 2 +-
 clang/lib/AST/PrintfFormatString.cpp | 8 
 clang/lib/ASTMatchers/Dynamic/Marshallers.cpp| 4 ++--
 clang/lib/Basic/Builtins.cpp | 2 +-
 clang/lib/Basic/Diagnostic.cpp   | 3 +--
 clang/lib/Basic/LangOptions.cpp  | 2 +-
 clang/lib/Basic/Targets/ARM.cpp  | 5 ++---
 clang/lib/Basic/Targets/PPC.h| 2 +-
 clang/lib/Basic/Targets/SystemZ.h| 2 +-
 clang/lib/Basic/Targets/X86.h| 6 +++---
 clang/lib/CodeGen/CodeGenFunction.cpp| 7 +++
 clang/lib/Format/ContinuationIndenter.cpp| 2 +-
 clang/lib/Format/Format.cpp  | 2 +-
 clang/lib/Frontend/CompilerInvocation.cpp| 2 +-
 clang/lib/Frontend/ModuleDependencyCollector.cpp | 2 +-
 clang/lib/Lex/PPDirectives.cpp   | 4 ++--
 clang/lib/Parse/ParseDecl.cpp| 2 +-
 clang/lib/Parse/ParseDeclCXX.cpp | 4 ++--
 clang/lib/Parse/ParseHLSL.cpp| 2 +-
 clang/lib/Parse/ParseOpenMP.cpp  | 4 ++--
 clang/lib/Sema/SemaCodeComplete.cpp  | 9 -
 clang/lib/Sema/SemaDecl.cpp  | 8 
 clang/lib/Sema/SemaDeclCXX.cpp   | 4 ++--
 clang/lib/Sema/SemaStmtAsm.cpp   | 2 +-
 clang/lib/Sema/SemaTemplate.cpp  | 4 ++--
 .../lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp  | 7 +++
 .../StaticAnalyzer/Checkers/LLVMConventionsChecker.cpp   | 2 +-
 .../lib/StaticAnalyzer/Checkers/LocalizationChecker.cpp  | 2 +-
 clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp  | 4 ++--
 .../StaticAnalyzer/Checkers/ObjCContainersASTChecker.cpp | 4 ++--
 .../StaticAnalyzer/Checkers/ObjCContainersChecker.cpp| 6 +++---
 clang/lib/StaticAnalyzer/Checkers/StreamChecker.cpp  | 2 +-
 clang/lib/StaticAnalyzer/Core/CheckerContext.cpp | 2 +-
 clang/lib/Tooling/Tooling.cpp| 2 +-
 clang/tools/diagtool/ShowEnabledWarnings.cpp | 4 ++--
 clang/tools/diagtool/TreeView.cpp| 2 +-
 clang/unittests/CodeGen/IRMatchers.h | 2 +-
 39 files changed, 68 insertions(+), 73 deletions(-)

diff --git a/clang/include/clang/Basic/IdentifierTable.h 
b/clang/include/clang/Basic/IdentifierTable.h
index a893e6f4d3d39..ae9ebd9f59154 100644
--- a/clang/include/clang/Basic/IdentifierTable.h
+++ b/clang/include/clang/Basic/IdentifierTable.h
@@ -738,7 +738,7 @@ class IdentifierTable {
 II->Entry = 
 
 // If this is the 'import' contextual keyword, mark it as such.
-if (Name.equals("import"))
+if (Name == "import")
   II->setModulesImport(true);
 
 return *II;
diff --git a/clang/include/clang/Basic/SourceManager.h 
b/clang/include/clang/Basic/SourceManager.h
index d2ece14da0b11..5258bab584f49 100644
--- a/clang/include/clang/Basic/SourceManager.h
+++ b/clang/include/clang/Basic/SourceManager.h
@@ -1504,7 +1504,7 @@ class SourceManager : public 
RefCountedBase {
 if (Presumed.isInvalid())
   return false;
 StringRef Filename(Presumed.getFilename());
-return Filename.equals("");
+return Filename == "";
   }
 
   /// Returns whether \p Loc is located in a  file.
@@ -1513,7 +1513,7 @@ class SourceManager : public 
RefCountedBase {
 if (Presumed.isInvalid())
   return false;