Skip to content

Commit f71b55e

Browse files
committed
GSB: Remove RequirementSource::usesRequirementSignature
This was only used by the old implementation of getConformanceAccessPath(). Also it wasn't part of the FoldingSet profile, which was potentially a source of latent bugs.
1 parent f3f9555 commit f71b55e

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

include/swift/AST/GenericSignatureBuilder.h

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -921,10 +921,6 @@ class GenericSignatureBuilder::RequirementSource final
921921
/// Whether there is a trailing written requirement location.
922922
const bool hasTrailingWrittenRequirementLoc;
923923

924-
public:
925-
/// Whether a protocol requirement came from the requirement signature.
926-
const bool usesRequirementSignature;
927-
928924
private:
929925
/// The actual storage, described by \c storageKind.
930926
union {
@@ -1020,7 +1016,7 @@ class GenericSignatureBuilder::RequirementSource final
10201016
WrittenRequirementLoc writtenReqLoc)
10211017
: kind(kind), storageKind(StorageKind::StoredType),
10221018
hasTrailingWrittenRequirementLoc(!writtenReqLoc.isNull()),
1023-
usesRequirementSignature(false), parent(nullptr) {
1019+
parent(nullptr) {
10241020
assert(isAcceptableStorageKind(kind, storageKind) &&
10251021
"RequirementSource kind/storageKind mismatch");
10261022

@@ -1036,7 +1032,6 @@ class GenericSignatureBuilder::RequirementSource final
10361032
WrittenRequirementLoc writtenReqLoc)
10371033
: kind(kind), storageKind(StorageKind::StoredType),
10381034
hasTrailingWrittenRequirementLoc(!writtenReqLoc.isNull()),
1039-
usesRequirementSignature(!protocol->isComputingRequirementSignature()),
10401035
parent(parent) {
10411036
assert((static_cast<bool>(parent) != isRootKind(kind)) &&
10421037
"Root RequirementSource should not have parent (or vice versa)");
@@ -1053,8 +1048,7 @@ class GenericSignatureBuilder::RequirementSource final
10531048
RequirementSource(Kind kind, const RequirementSource *parent,
10541049
ProtocolConformanceRef conformance)
10551050
: kind(kind), storageKind(StorageKind::ProtocolConformance),
1056-
hasTrailingWrittenRequirementLoc(false),
1057-
usesRequirementSignature(false), parent(parent) {
1051+
hasTrailingWrittenRequirementLoc(false), parent(parent) {
10581052
assert((static_cast<bool>(parent) != isRootKind(kind)) &&
10591053
"Root RequirementSource should not have parent (or vice versa)");
10601054
assert(isAcceptableStorageKind(kind, storageKind) &&
@@ -1066,8 +1060,7 @@ class GenericSignatureBuilder::RequirementSource final
10661060
RequirementSource(Kind kind, const RequirementSource *parent,
10671061
AssociatedTypeDecl *assocType)
10681062
: kind(kind), storageKind(StorageKind::AssociatedTypeDecl),
1069-
hasTrailingWrittenRequirementLoc(false),
1070-
usesRequirementSignature(false), parent(parent) {
1063+
hasTrailingWrittenRequirementLoc(false), parent(parent) {
10711064
assert((static_cast<bool>(parent) != isRootKind(kind)) &&
10721065
"Root RequirementSource should not have parent (or vice versa)");
10731066
assert(isAcceptableStorageKind(kind, storageKind) &&
@@ -1078,8 +1071,7 @@ class GenericSignatureBuilder::RequirementSource final
10781071

10791072
RequirementSource(Kind kind, const RequirementSource *parent)
10801073
: kind(kind), storageKind(StorageKind::None),
1081-
hasTrailingWrittenRequirementLoc(false),
1082-
usesRequirementSignature(false), parent(parent) {
1074+
hasTrailingWrittenRequirementLoc(false), parent(parent) {
10831075
assert((static_cast<bool>(parent) != isRootKind(kind)) &&
10841076
"Root RequirementSource should not have parent (or vice versa)");
10851077
assert(isAcceptableStorageKind(kind, storageKind) &&
@@ -1089,8 +1081,7 @@ class GenericSignatureBuilder::RequirementSource final
10891081
RequirementSource(Kind kind, const RequirementSource *parent,
10901082
Type newType)
10911083
: kind(kind), storageKind(StorageKind::StoredType),
1092-
hasTrailingWrittenRequirementLoc(false),
1093-
usesRequirementSignature(false), parent(parent) {
1084+
hasTrailingWrittenRequirementLoc(false), parent(parent) {
10941085
assert((static_cast<bool>(parent) != isRootKind(kind)) &&
10951086
"Root RequirementSource should not have parent (or vice versa)");
10961087
assert(isAcceptableStorageKind(kind, storageKind) &&

0 commit comments

Comments
 (0)