[Sema] Declare GlobalMethodPool with using (NFC) #109437
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GlobalMethodPool is a wrapper around DenseMap that does not add anything except: using Lists = std::pair<ObjCMethodList, ObjCMethodList>; This patch removes the wrapper and switches to an alias with "using". In ReadMethodPool in ASTReader.cpp, we can simplify: insert(std::make_pair(Sel, SemaObjC::GlobalMethodPool::Lists())) to: try_emplace(Sel) But then try_emplace(Sel).first->second is the same as operator[], so this patch simplifies the rest of the function.
llvmbot
added
clang
|
@llvm/pr-subscribers-clang-modules Author: Kazu Hirata (kazutakahirata) ChangesGlobalMethodPool is a wrapper around DenseMap that does not add using Lists = std::pair<ObjCMethodList, ObjCMethodList>; This patch removes the wrapper and switches to an alias with "using". In ReadMethodPool in ASTReader.cpp, we can simplify: insert(std::make_pair(Sel, SemaObjC::GlobalMethodPool::Lists())) to: try_emplace(Sel) But then try_emplace(Sel).first->second is the same as operator[], so Full diff: https://github.com/llvm/llvm-project/pull/109437.diff 3 Files Affected:
diff --git a/clang/include/clang/Sema/SemaObjC.h b/clang/include/clang/Sema/SemaObjC.h
index b868e9e7cd0aa9..9367c680953f71 100644
--- a/clang/include/clang/Sema/SemaObjC.h
+++ b/clang/include/clang/Sema/SemaObjC.h
@@ -208,23 +208,8 @@ class SemaObjC : public SemaBase {
/// of -Wselector.
llvm::MapVector<Selector, SourceLocation> ReferencedSelectors;
- class GlobalMethodPool {
- public:
- using Lists = std::pair<ObjCMethodList, ObjCMethodList>;
- using iterator = llvm::DenseMap<Selector, Lists>::iterator;
- iterator begin() { return Methods.begin(); }
- iterator end() { return Methods.end(); }
- iterator find(Selector Sel) { return Methods.find(Sel); }
- std::pair<iterator, bool> insert(std::pair<Selector, Lists> &&Val) {
- return Methods.insert(Val);
- }
- Lists &operator[](Selector Key) { return Methods[Key]; }
- int count(Selector Sel) const { return Methods.count(Sel); }
- bool empty() const { return Methods.empty(); }
-
- private:
- llvm::DenseMap<Selector, Lists> Methods;
- };
+ using GlobalMethodPool =
+ llvm::DenseMap<Selector, std::pair<ObjCMethodList, ObjCMethodList>>;
/// Method Pool - allows efficient lookup when typechecking messages to "id".
/// We need to maintain a list, since selectors can have differing signatures
diff --git a/clang/lib/Sema/SemaDeclObjC.cpp b/clang/lib/Sema/SemaDeclObjC.cpp
index 87be43b13813d3..d8cd09b8272930 100644
--- a/clang/lib/Sema/SemaDeclObjC.cpp
+++ b/clang/lib/Sema/SemaDeclObjC.cpp
@@ -3649,7 +3649,7 @@ ObjCMethodDecl *SemaObjC::LookupImplementedMethodInGlobalPool(Selector Sel) {
if (Pos == MethodPool.end())
return nullptr;
- GlobalMethodPool::Lists &Methods = Pos->second;
+ auto &Methods = Pos->second;
for (const ObjCMethodList *Method = &Methods.first; Method;
Method = Method->getNext())
if (Method->getMethod() &&
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index 7efcc81e194d95..47a286be2303fd 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -8751,22 +8751,18 @@ void ASTReader::ReadMethodPool(Selector Sel) {
return;
Sema &S = *getSema();
- SemaObjC::GlobalMethodPool::iterator Pos =
- S.ObjC()
- .MethodPool
- .insert(std::make_pair(Sel, SemaObjC::GlobalMethodPool::Lists()))
- .first;
+ auto &Methods = S.ObjC().MethodPool[Sel];
- Pos->second.first.setBits(Visitor.getInstanceBits());
- Pos->second.first.setHasMoreThanOneDecl(Visitor.instanceHasMoreThanOneDecl());
- Pos->second.second.setBits(Visitor.getFactoryBits());
- Pos->second.second.setHasMoreThanOneDecl(Visitor.factoryHasMoreThanOneDecl());
+ Methods.first.setBits(Visitor.getInstanceBits());
+ Methods.first.setHasMoreThanOneDecl(Visitor.instanceHasMoreThanOneDecl());
+ Methods.second.setBits(Visitor.getFactoryBits());
+ Methods.second.setHasMoreThanOneDecl(Visitor.factoryHasMoreThanOneDecl());
// Add methods to the global pool *after* setting hasMoreThanOneDecl, since
// when building a module we keep every method individually and may need to
// update hasMoreThanOneDecl as we add the methods.
- addMethodsToPool(S, Visitor.getInstanceMethods(), Pos->second.first);
- addMethodsToPool(S, Visitor.getFactoryMethods(), Pos->second.second);
+ addMethodsToPool(S, Visitor.getInstanceMethods(), Methods.first);
+ addMethodsToPool(S, Visitor.getFactoryMethods(), Methods.second);
}
void ASTReader::updateOutOfDateSelector(Selector Sel) {
|
|
@llvm/pr-subscribers-clang Author: Kazu Hirata (kazutakahirata) ChangesGlobalMethodPool is a wrapper around DenseMap that does not add using Lists = std::pair<ObjCMethodList, ObjCMethodList>; This patch removes the wrapper and switches to an alias with "using". In ReadMethodPool in ASTReader.cpp, we can simplify: insert(std::make_pair(Sel, SemaObjC::GlobalMethodPool::Lists())) to: try_emplace(Sel) But then try_emplace(Sel).first->second is the same as operator[], so Full diff: https://github.com/llvm/llvm-project/pull/109437.diff 3 Files Affected:
diff --git a/clang/include/clang/Sema/SemaObjC.h b/clang/include/clang/Sema/SemaObjC.h
index b868e9e7cd0aa9..9367c680953f71 100644
--- a/clang/include/clang/Sema/SemaObjC.h
+++ b/clang/include/clang/Sema/SemaObjC.h
@@ -208,23 +208,8 @@ class SemaObjC : public SemaBase {
/// of -Wselector.
llvm::MapVector<Selector, SourceLocation> ReferencedSelectors;
- class GlobalMethodPool {
- public:
- using Lists = std::pair<ObjCMethodList, ObjCMethodList>;
- using iterator = llvm::DenseMap<Selector, Lists>::iterator;
- iterator begin() { return Methods.begin(); }
- iterator end() { return Methods.end(); }
- iterator find(Selector Sel) { return Methods.find(Sel); }
- std::pair<iterator, bool> insert(std::pair<Selector, Lists> &&Val) {
- return Methods.insert(Val);
- }
- Lists &operator[](Selector Key) { return Methods[Key]; }
- int count(Selector Sel) const { return Methods.count(Sel); }
- bool empty() const { return Methods.empty(); }
-
- private:
- llvm::DenseMap<Selector, Lists> Methods;
- };
+ using GlobalMethodPool =
+ llvm::DenseMap<Selector, std::pair<ObjCMethodList, ObjCMethodList>>;
/// Method Pool - allows efficient lookup when typechecking messages to "id".
/// We need to maintain a list, since selectors can have differing signatures
diff --git a/clang/lib/Sema/SemaDeclObjC.cpp b/clang/lib/Sema/SemaDeclObjC.cpp
index 87be43b13813d3..d8cd09b8272930 100644
--- a/clang/lib/Sema/SemaDeclObjC.cpp
+++ b/clang/lib/Sema/SemaDeclObjC.cpp
@@ -3649,7 +3649,7 @@ ObjCMethodDecl *SemaObjC::LookupImplementedMethodInGlobalPool(Selector Sel) {
if (Pos == MethodPool.end())
return nullptr;
- GlobalMethodPool::Lists &Methods = Pos->second;
+ auto &Methods = Pos->second;
for (const ObjCMethodList *Method = &Methods.first; Method;
Method = Method->getNext())
if (Method->getMethod() &&
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index 7efcc81e194d95..47a286be2303fd 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -8751,22 +8751,18 @@ void ASTReader::ReadMethodPool(Selector Sel) {
return;
Sema &S = *getSema();
- SemaObjC::GlobalMethodPool::iterator Pos =
- S.ObjC()
- .MethodPool
- .insert(std::make_pair(Sel, SemaObjC::GlobalMethodPool::Lists()))
- .first;
+ auto &Methods = S.ObjC().MethodPool[Sel];
- Pos->second.first.setBits(Visitor.getInstanceBits());
- Pos->second.first.setHasMoreThanOneDecl(Visitor.instanceHasMoreThanOneDecl());
- Pos->second.second.setBits(Visitor.getFactoryBits());
- Pos->second.second.setHasMoreThanOneDecl(Visitor.factoryHasMoreThanOneDecl());
+ Methods.first.setBits(Visitor.getInstanceBits());
+ Methods.first.setHasMoreThanOneDecl(Visitor.instanceHasMoreThanOneDecl());
+ Methods.second.setBits(Visitor.getFactoryBits());
+ Methods.second.setHasMoreThanOneDecl(Visitor.factoryHasMoreThanOneDecl());
// Add methods to the global pool *after* setting hasMoreThanOneDecl, since
// when building a module we keep every method individually and may need to
// update hasMoreThanOneDecl as we add the methods.
- addMethodsToPool(S, Visitor.getInstanceMethods(), Pos->second.first);
- addMethodsToPool(S, Visitor.getFactoryMethods(), Pos->second.second);
+ addMethodsToPool(S, Visitor.getInstanceMethods(), Methods.first);
+ addMethodsToPool(S, Visitor.getFactoryMethods(), Methods.second);
}
void ASTReader::updateOutOfDateSelector(Selector Sel) {
|
xgupta
pushed a commit
to xgupta/llvm-project
that referenced
this pull request
Oct 4, 2024
GlobalMethodPool is a wrapper around DenseMap that does not add anything except: using Lists = std::pair<ObjCMethodList, ObjCMethodList>; This patch removes the wrapper and switches to an alias with "using". In ReadMethodPool in ASTReader.cpp, we can simplify: insert(std::make_pair(Sel, SemaObjC::GlobalMethodPool::Lists())) to: try_emplace(Sel) But then try_emplace(Sel).first->second is the same as operator[], so this patch simplifies the rest of the function.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
GlobalMethodPool is a wrapper around DenseMap that does not add
anything except:
using Lists = std::pair<ObjCMethodList, ObjCMethodList>;
This patch removes the wrapper and switches to an alias with "using".
In ReadMethodPool in ASTReader.cpp, we can simplify:
insert(std::make_pair(Sel, SemaObjC::GlobalMethodPool::Lists()))
to:
try_emplace(Sel)
But then try_emplace(Sel).first->second is the same as operator[], so
this patch simplifies the rest of the function.