Merge pull request #58781 from slavapestov/finally-remove-the-gsb

Remove the GenericSignatureBuilder

Author: slavapestov

include/swift/AST/DiagnosticsCommon.def

@@ -90,10 +90,6 @@ NOTE(note_typo_candidate,none,
 NOTE(profile_read_error,none,
      "failed to load profile data '%0': '%1'", (StringRef, StringRef))
 
-WARNING(protocol_extension_redundant_requirement,none,
-      "requirement of '%1' to '%2' is redundant in an extension of '%0'",
-      (StringRef, StringRef, StringRef))
-
 ERROR(attr_only_on_parameters, none,
       "'%0' may only be used on parameters", (StringRef))
 

include/swift/AST/DiagnosticsSema.def

@@ -2477,10 +2477,6 @@ ERROR(requires_not_suitable_archetype,none,
       "type %0 in conformance requirement does not refer to a "
       "generic parameter or associated type",
       (Type))
-WARNING(requires_no_same_type_archetype,none,
-        "neither type in same-type constraint (%0 or %1) refers to a "
-        "generic parameter or associated type",
-        (Type, Type))
 
 ERROR(requires_generic_params_made_equal,none,
       "same-type requirement makes generic parameters %0 and %1 equivalent",
@@ -2494,71 +2490,32 @@ ERROR(recursive_generic_signature,none,
       "%0 %1 has self-referential generic requirements", (DescriptiveDeclKind, DeclBaseName))
 ERROR(recursive_generic_signature_extension,none,
       "extension of %0 %1 has self-referential generic requirements", (DescriptiveDeclKind, DeclBaseName))
-ERROR(recursive_same_type_constraint,none,
-      "same-type constraint %0 == %1 is recursive", (Type, Type))
-ERROR(recursive_superclass_constraint,none,
-      "superclass constraint %0 : %1 is recursive", (Type, Type))
-ERROR(requires_generic_param_same_type_does_not_conform,none,
-      "same-type constraint type %0 does not conform to required protocol %1",
-      (Type, Identifier))
-ERROR(same_type_does_not_inherit,none,
-      "same-type constraint type %0 does not inherit from required superclass %1",
-      (Type, Type))
 ERROR(requires_same_concrete_type,none,
       "generic signature requires types %0 and %1 to be the same", (Type, Type))
 WARNING(redundant_conformance_constraint,none,
         "redundant conformance constraint %0 : %1", (Type, ProtocolDecl *))
-NOTE(redundant_conformance_here,none,
-     "conformance constraint %0 : %1 implied here",
-     (Type, ProtocolDecl *))
 
 WARNING(missing_protocol_refinement, none,
         "protocol %0 should be declared to refine %1 due to a same-type constraint on 'Self'",
         (ProtocolDecl *, ProtocolDecl *))
 
-ERROR(same_type_conflict,none,
-      "%select{generic parameter |protocol |}0%1 cannot be equal to both "
-      "%2 and %3", (unsigned, Type, Type, Type))
 ERROR(requirement_conflict,none,
       "no type for %0 can satisfy both %1",
       (Type, StringRef))
 WARNING(redundant_same_type_to_concrete,none,
         "redundant same-type constraint %0 == %1", (Type, Type))
-NOTE(same_type_redundancy_here,none,
-     "same-type constraint %1 == %2 %select{written here|implied here|"
-     "inferred from type here}0",
-     (unsigned, Type, Type))
 ERROR(conflicting_superclass_constraints,none,
       "type %0 cannot be a subclass of both %1 and %2",
       (Type, Type, Type))
-NOTE(conflicting_superclass_constraint,none,
-     "constraint conflicts with %0 : %1",
-     (Type, Type))
 WARNING(redundant_superclass_constraint,none,
         "redundant superclass constraint %0 : %1", (Type, Type))
-NOTE(superclass_redundancy_here,none,
-     "superclass constraint %0 : %1 implied here",
-     (Type, Type))
 
-ERROR(conflicting_layout_constraints,none,
-      "type %0 has conflicting constraints %1 and %2",
-      (Type, LayoutConstraint, LayoutConstraint))
-NOTE(conflicting_layout_constraint, none,
-     "constraint conflicts with %0 : %1",
-     (Type, LayoutConstraint))
 WARNING(redundant_layout_constraint,none,
         "redundant constraint %0 : %1",
         (Type, LayoutConstraint))
-NOTE(previous_layout_constraint, none,
-     "constraint %0 : %1 implied here",
-     (Type, LayoutConstraint))
 
 WARNING(redundant_same_type_constraint,none,
         "redundant same-type constraint %0 == %1", (Type, Type))
-NOTE(previous_same_type_constraint, none,
-     "previous same-type constraint %1 == %2 "
-     "%select{written here|implied here|inferred from type here}0",
-     (unsigned, Type, Type))
 
 WARNING(inherited_associated_type_redecl,none,
         "redeclaration of associated type %0 from protocol %1 is better "

include/swift/AST/TypeCheckRequests.h

@@ -472,48 +472,6 @@ class ProtocolDependenciesRequest :
   bool isCached() const { return true; }
 };
 
-/// Compute a protocol's requirement signature using the RequirementMachine.
-/// This is temporary; once the GenericSignatureBuilder goes away this will
-/// be folded into RequirementSignatureRequest.
-class RequirementSignatureRequestRQM :
-    public SimpleRequest<RequirementSignatureRequestRQM,
-                         RequirementSignature(ProtocolDecl *),
-                         RequestFlags::Cached> {
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  // Evaluation.
-  RequirementSignature
-  evaluate(Evaluator &evaluator, ProtocolDecl *proto) const;
-
-public:
-  bool isCached() const { return true; }
-};
-
-/// Compute a protocol's requirement signature using the GenericSignatureBuilder.
-/// This is temporary; once the GenericSignatureBuilder goes away this will
-/// be removed.
-class RequirementSignatureRequestGSB :
-    public SimpleRequest<RequirementSignatureRequestGSB,
-                         RequirementSignature(ProtocolDecl *),
-                         RequestFlags::Cached> {
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  // Evaluation.
-  RequirementSignature
-  evaluate(Evaluator &evaluator, ProtocolDecl *proto) const;
-
-public:
-  bool isCached() const { return true; }
-};
-
 /// Compute the requirements that describe a protocol.
 class RequirementSignatureRequest :
     public SimpleRequest<RequirementSignatureRequest,
@@ -1821,114 +1779,8 @@ class AbstractGenericSignatureRequest :
   }
 };
 
-/// Build a generic signature using the RequirementMachine. This is temporary;
-/// once the GenericSignatureBuilder goes away this will be folded into
-/// AbstractGenericSignatureRequest.
-class AbstractGenericSignatureRequestRQM :
-    public SimpleRequest<AbstractGenericSignatureRequestRQM,
-                         GenericSignatureWithError (const GenericSignatureImpl *,
-                                                    SmallVector<GenericTypeParamType *, 2>,
-                                                    SmallVector<Requirement, 2>),
-                         RequestFlags::Cached> {
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  // Evaluation.
-  GenericSignatureWithError
-  evaluate(Evaluator &evaluator,
-           const GenericSignatureImpl *baseSignature,
-           SmallVector<GenericTypeParamType *, 2> addedParameters,
-           SmallVector<Requirement, 2> addedRequirements) const;
-
-public:
-  // Separate caching.
-  bool isCached() const { return true; }
-
-  /// Abstract generic signature requests never have source-location info.
-  SourceLoc getNearestLoc() const {
-    return SourceLoc();
-  }
-};
-
-/// Build a generic signature using the GenericSignatureBuilder. This is temporary;
-/// once the GenericSignatureBuilder goes away this will be removed.
-class AbstractGenericSignatureRequestGSB :
-    public SimpleRequest<AbstractGenericSignatureRequestGSB,
-                         GenericSignatureWithError (const GenericSignatureImpl *,
-                                                    SmallVector<GenericTypeParamType *, 2>,
-                                                    SmallVector<Requirement, 2>),
-                         RequestFlags::Cached> {
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  // Evaluation.
-  GenericSignatureWithError
-  evaluate(Evaluator &evaluator,
-           const GenericSignatureImpl *baseSignature,
-           SmallVector<GenericTypeParamType *, 2> addedParameters,
-           SmallVector<Requirement, 2> addedRequirements) const;
-
-public:
-  // Separate caching.
-  bool isCached() const { return true; }
-
-  /// Abstract generic signature requests never have source-location info.
-  SourceLoc getNearestLoc() const {
-    return SourceLoc();
-  }
-};
-
 class InferredGenericSignatureRequest :
     public SimpleRequest<InferredGenericSignatureRequest,
-                         GenericSignatureWithError (ModuleDecl *,
-                                                    const GenericSignatureImpl *,
-                                                    GenericParamList *,
-                                                    WhereClauseOwner,
-                                                    SmallVector<Requirement, 2>,
-                                                    SmallVector<TypeLoc, 2>,
-                                                    bool),
-                         RequestFlags::Cached> {
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  // Evaluation.
-  GenericSignatureWithError
-  evaluate(Evaluator &evaluator,
-           ModuleDecl *parentModule,
-           const GenericSignatureImpl *baseSignature,
-           GenericParamList *genericParams,
-           WhereClauseOwner whereClause,
-           SmallVector<Requirement, 2> addedRequirements,
-           SmallVector<TypeLoc, 2> inferenceSources,
-           bool allowConcreteGenericParams) const;
-
-public:
-  // Separate caching.
-  bool isCached() const { return true; }
-
-  /// Inferred generic signature requests don't have source-location info.
-  SourceLoc getNearestLoc() const {
-    return SourceLoc();
-  }
-
-  // Cycle handling.
-  void noteCycleStep(DiagnosticEngine &diags) const;
-};
-
-/// Build a generic signature using the RequirementMachine. This is temporary;
-/// once the GenericSignatureBuilder goes away this will be folded into
-/// InferredGenericSignatureRequest.
-class InferredGenericSignatureRequestRQM :
-    public SimpleRequest<InferredGenericSignatureRequestRQM,
                          GenericSignatureWithError (const GenericSignatureImpl *,
                                                     GenericParamList *,
                                                     WhereClauseOwner,
@@ -1965,48 +1817,6 @@ class InferredGenericSignatureRequestRQM :
   void noteCycleStep(DiagnosticEngine &diags) const;
 };
 
-/// Build a generic signature using the GenericSignatureBuilder. This is temporary;
-/// once the GenericSignatureBuilder goes away this will be removed.
-class InferredGenericSignatureRequestGSB :
-    public SimpleRequest<InferredGenericSignatureRequestGSB,
-                         GenericSignatureWithError (ModuleDecl *,
-                                                    const GenericSignatureImpl *,
-                                                    GenericParamList *,
-                                                    WhereClauseOwner,
-                                                    SmallVector<Requirement, 2>,
-                                                    SmallVector<TypeLoc, 2>,
-                                                    bool),
-                         RequestFlags::Cached> {
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  // Evaluation.
-  GenericSignatureWithError
-  evaluate(Evaluator &evaluator,
-           ModuleDecl *parentModule,
-           const GenericSignatureImpl *baseSignature,
-           GenericParamList *genericParams,
-           WhereClauseOwner whereClause,
-           SmallVector<Requirement, 2> addedRequirements,
-           SmallVector<TypeLoc, 2> inferenceSources,
-           bool allowConcreteGenericParams) const;
-
-public:
-  // Separate caching.
-  bool isCached() const { return true; }
-
-  /// Inferred generic signature requests don't have source-location info.
-  SourceLoc getNearestLoc() const {
-    return SourceLoc();
-  }
-
-  // Cycle handling.
-  void noteCycleStep(DiagnosticEngine &diags) const;
-};
-
 void simple_display(llvm::raw_ostream &out, const TypeLoc source);
 
 class ExtendedTypeRequest

include/swift/AST/TypeCheckerTypeIDZone.def

@@ -20,16 +20,6 @@ SWIFT_REQUEST(TypeChecker, AbstractGenericSignatureRequest,
                                          SmallVector<GenericTypeParamType *, 2>,
                                          SmallVector<Requirement, 2>),
               Cached, NoLocationInfo)
-SWIFT_REQUEST(TypeChecker, AbstractGenericSignatureRequestRQM,
-              GenericSignatureWithError (const GenericSignatureImpl *,
-                                         SmallVector<GenericTypeParamType *, 2>,
-                                         SmallVector<Requirement, 2>),
-              Cached, NoLocationInfo)
-SWIFT_REQUEST(TypeChecker, AbstractGenericSignatureRequestGSB,
-              GenericSignatureWithError (const GenericSignatureImpl *,
-                                         SmallVector<GenericTypeParamType *, 2>,
-                                         SmallVector<Requirement, 2>),
-              Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, ApplyAccessNoteRequest,
               evaluator::SideEffect(ValueDecl *), Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, AttachedResultBuilderRequest,
@@ -188,24 +178,7 @@ SWIFT_REQUEST(TypeChecker, HasImplementationOnlyImportsRequest,
 SWIFT_REQUEST(TypeChecker, ModuleLibraryLevelRequest,
               LibraryLevel(ModuleDecl *), Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, InferredGenericSignatureRequest,
-              GenericSignatureWithError (ModuleDecl *,
-                                         const GenericSignatureImpl *,
-                                         GenericParamList *,
-                                         WhereClauseOwner,
-                                         SmallVector<Requirement, 2>,
-                                         SmallVector<TypeLoc, 2>, bool),
-              Cached, NoLocationInfo)
-SWIFT_REQUEST(TypeChecker, InferredGenericSignatureRequestRQM,
-              GenericSignatureWithError (ModuleDecl *,
-                                         const GenericSignatureImpl *,
-                                         GenericParamList *,
-                                         WhereClauseOwner,
-                                         SmallVector<Requirement, 2>,
-                                         SmallVector<TypeLoc, 2>, bool),
-              Cached, NoLocationInfo)
-SWIFT_REQUEST(TypeChecker, InferredGenericSignatureRequestGSB,
-              GenericSignatureWithError (ModuleDecl *,
-                                         const GenericSignatureImpl *,
+              GenericSignatureWithError (const GenericSignatureImpl *,
                                          GenericParamList *,
                                          WhereClauseOwner,
                                          SmallVector<Requirement, 2>,
@@ -304,12 +277,6 @@ SWIFT_REQUEST(TypeChecker, TypeAliasRequirementsRequest,
 SWIFT_REQUEST(TypeChecker, ProtocolDependenciesRequest,
               ArrayRef<ProtocolDecl *>(ProtocolDecl *), Cached,
               HasNearestLocation)
-SWIFT_REQUEST(TypeChecker, RequirementSignatureRequestRQM,
-              RequirementSignature(ProtocolDecl *), Cached,
-              NoLocationInfo)
-SWIFT_REQUEST(TypeChecker, RequirementSignatureRequestGSB,
-              RequirementSignature(ProtocolDecl *), Cached,
-              NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, RequirementSignatureRequest,
               RequirementSignature(ProtocolDecl *), SeparatelyCached,
               NoLocationInfo)