Skip to content

Commit de18d11

Browse files
committed
[AST] Rename "semantic members" to "ABI members".
The "semantic members" query produces the list of members that can affect the ABI, e.g., of classes. It does not produce the complete list of members suitable for semantic queries. (cherry picked from commit a8f7f0d)
1 parent 6e56634 commit de18d11

File tree

10 files changed

+16
-15
lines changed

10 files changed

+16
-15
lines changed

include/swift/AST/Decl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3541,7 +3541,7 @@ class ClassDecl final : public NominalTypeDecl {
35413541

35423542
friend class SuperclassDeclRequest;
35433543
friend class SuperclassTypeRequest;
3544-
friend class SemanticMembersRequest;
3544+
friend class ABIMembersRequest;
35453545
friend class HasMissingDesignatedInitializersRequest;
35463546
friend class InheritsSuperclassInitializersRequest;
35473547

include/swift/AST/DeclContext.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -778,10 +778,11 @@ class IterableDeclContext {
778778
/// the implementation.
779779
ArrayRef<Decl *> getParsedMembers() const;
780780

781-
/// Get all the members that are semantically within this context,
782-
/// including any implicitly-synthesized members.
781+
/// Get all of the members within this context that can affect ABI, including
782+
/// any implicitly-synthesized members.
783+
///
783784
/// The resulting list of members will be stable across translation units.
784-
ArrayRef<Decl *> getSemanticMembers() const;
785+
ArrayRef<Decl *> getABIMembers() const;
785786

786787
/// Retrieve the set of members in this context without loading any from the
787788
/// associated lazy loader; this should only be used as part of implementing

include/swift/AST/TypeCheckRequests.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,8 +1221,8 @@ class SynthesizeAccessorRequest :
12211221
void cacheResult(AccessorDecl *value) const;
12221222
};
12231223

1224-
class SemanticMembersRequest :
1225-
public SimpleRequest<SemanticMembersRequest,
1224+
class ABIMembersRequest :
1225+
public SimpleRequest<ABIMembersRequest,
12261226
ArrayRef<Decl *>(IterableDeclContext *),
12271227
RequestFlags::Cached> {
12281228
public:

include/swift/AST/TypeCheckerTypeIDZone.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ SWIFT_REQUEST(TypeChecker, TypeEraserHasViableInitRequest,
6565
SWIFT_REQUEST(TypeChecker, DynamicallyReplacedDeclRequest,
6666
ValueDecl *(ValueDecl *),
6767
Cached, NoLocationInfo)
68-
SWIFT_REQUEST(TypeChecker, SemanticMembersRequest,
68+
SWIFT_REQUEST(TypeChecker, ABIMembersRequest,
6969
ArrayRef<Decl *>(IterableDeclContext *), Cached, NoLocationInfo)
7070
SWIFT_REQUEST(TypeChecker, SpecializeAttrTargetDeclRequest,
7171
ValueDecl *(const ValueDecl *, SpecializeAttr *),

include/swift/SIL/SILVTableVisitor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ template <class T> class SILVTableVisitor {
148148
if (!theClass->hasKnownSwiftImplementation())
149149
return;
150150

151-
for (auto member : theClass->getSemanticMembers())
151+
for (auto member : theClass->getABIMembers())
152152
maybeAddMember(member);
153153
}
154154
};

lib/AST/DeclContext.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -758,11 +758,11 @@ ArrayRef<Decl *> IterableDeclContext::getParsedMembers() const {
758758
.members;
759759
}
760760

761-
ArrayRef<Decl *> IterableDeclContext::getSemanticMembers() const {
761+
ArrayRef<Decl *> IterableDeclContext::getABIMembers() const {
762762
ASTContext &ctx = getASTContext();
763763
return evaluateOrDefault(
764764
ctx.evaluator,
765-
SemanticMembersRequest{const_cast<IterableDeclContext *>(this)},
765+
ABIMembersRequest{const_cast<IterableDeclContext *>(this)},
766766
ArrayRef<Decl *>());
767767
}
768768

lib/SILGen/SILGenType.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,7 @@ class SILGenType : public TypeMemberVisitor<SILGenType> {
10381038

10391039
// Build a vtable if this is a class.
10401040
if (auto theClass = dyn_cast<ClassDecl>(theType)) {
1041-
for (Decl *member : theClass->getSemanticMembers())
1041+
for (Decl *member : theClass->getABIMembers())
10421042
visit(member);
10431043

10441044
SILGenVTable genVTable(SGM, theClass);

lib/Sema/TypeCheckDecl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2551,8 +2551,8 @@ struct SortedDeclList {
25512551
} // end namespace
25522552

25532553
ArrayRef<Decl *>
2554-
SemanticMembersRequest::evaluate(Evaluator &evaluator,
2555-
IterableDeclContext *idc) const {
2554+
ABIMembersRequest::evaluate(
2555+
Evaluator &evaluator, IterableDeclContext *idc) const {
25562556
auto dc = cast<DeclContext>(idc->getDecl());
25572557
auto &Context = dc->getASTContext();
25582558
SmallVector<Decl *, 8> result;

lib/Sema/TypeCheckDeclPrimary.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2129,7 +2129,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
21292129

21302130
TypeChecker::checkDeclAttributes(CD);
21312131

2132-
for (Decl *Member : CD->getSemanticMembers())
2132+
for (Decl *Member : CD->getABIMembers())
21332133
visit(Member);
21342134

21352135
TypeChecker::checkPatternBindingCaptures(CD);

lib/Sema/TypeCheckProtocol.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4641,7 +4641,7 @@ ConformanceChecker::getObjCRequirements(ObjCMethodKey key) {
46414641

46424642
// Fill in the data structure if we haven't done so yet.
46434643
if (!computedObjCMethodRequirements) {
4644-
for (auto requirement : proto->getSemanticMembers()) {
4644+
for (auto requirement : proto->getABIMembers()) {
46454645
auto funcRequirement = dyn_cast<AbstractFunctionDecl>(requirement);
46464646
if (!funcRequirement)
46474647
continue;

0 commit comments

Comments
 (0)