Merge pull request #3033 from slavapestov/declared-type-untangling

Author: swift-ci

include/swift/AST/Decl.h

@@ -2411,14 +2411,14 @@ class GenericTypeDecl : public TypeDecl, public DeclContext {
     return GenericSig;
   }
 
-  void setIsValidatingGenericSignature(bool ivgs = true) {
-    ValidatingGenericSignature = ivgs;
+  void setIsValidatingGenericSignature(bool validating=true) {
+    ValidatingGenericSignature = validating;
   }
 
   bool isValidatingGenericSignature() const {
     return ValidatingGenericSignature;
   }
-  
+
   // Resolve ambiguity due to multiple base classes.
   using TypeDecl::getASTContext;
   using DeclContext::operator new;
@@ -2847,12 +2847,15 @@ class NominalTypeDecl : public GenericTypeDecl, public IterableDeclContext {
     return SearchedForFailableInits;
   }
 
-  /// getDeclaredType - Retrieve the type declared by this entity.
-  Type getDeclaredType() const { return DeclaredTy; }
-
-  /// Compute the type (and declared type) of this nominal type.
+  /// Compute the type of this nominal type.
   void computeType();
 
+  /// getDeclaredType - Retrieve the type declared by this entity, without
+  /// any generic parameters bound if this is a generic type.
+  Type getDeclaredType() const;
+
+  /// getDeclaredType - Retrieve the type declared by this entity, with
+  /// context archetypes bound if this is a generic type.
   Type getDeclaredTypeInContext() const;
 
   /// Get the "interface" type of the given nominal type, which is the
@@ -3437,7 +3440,8 @@ class ProtocolDecl : public NominalTypeDecl {
   bool inheritsFrom(const ProtocolDecl *Super) const;
 
   ProtocolType *getDeclaredType() const {
-    return reinterpret_cast<ProtocolType *>(DeclaredTy.getPointer());
+    return reinterpret_cast<ProtocolType *>(
+      NominalTypeDecl::getDeclaredType().getPointer());
   }
 
   SourceLoc getStartLoc() const { return ProtocolLoc; }

include/swift/AST/DiagnosticsParse.def

@@ -175,8 +175,6 @@ ERROR(disallowed_var_multiple_getset,none,
       "'var' declarations with multiple variables cannot have explicit"
       " getters/setters", ())
 
-ERROR(disallowed_type,none,
-      "type not allowed here", ())
 ERROR(disallowed_init,none,
       "initial value is not allowed here", ())
 ERROR(var_init_self_referential,none,
@@ -1289,6 +1287,10 @@ ERROR(redundant_class_requirement,none,
       "redundant 'class' requirement", ())
 ERROR(late_class_requirement,none,
       "'class' must come first in the requirement list", ())
+ERROR(where_without_generic_params,none,
+      "'where' clause cannot be attached to "
+      "%select{a non-generic|a protocol|an associated type}0 "
+      "declaration", (unsigned))
 
 //------------------------------------------------------------------------------
 // Conditional compilation parsing diagnostics

include/swift/AST/DiagnosticsSema.def

@@ -572,10 +572,6 @@ NOTE(object_literal_resolve_import,none,
      "import %0 to use '%1' as the default %2 literal type",
      (StringRef, StringRef, StringRef))
 
-ERROR(use_non_type_value,none,
-      "%0 is not a type", (Identifier))
-NOTE(use_non_type_value_prev,none,
-     "%0 declared here", (Identifier))
 ERROR(use_local_before_declaration,none,
       "use of local variable %0 before its declaration", (DeclName))
 ERROR(unsupported_existential_type,none,
@@ -1057,14 +1053,26 @@ ERROR(pattern_binds_no_variables,none,
 
 // Generic types
 ERROR(unsupported_generic_nested_in_type,none,
-      "generic type %0 nested in type %1 is not allowed",
-      (Identifier, Type))
+      "generic type %0 cannot be nested in type %1",
+      (Identifier, Identifier))
 ERROR(unsupported_type_nested_in_generic_type,none,
-      "type %0 nested in generic type %1 is not allowed",
-      (Identifier, Type))
+      "type %0 cannot be nested in generic type %1",
+      (Identifier, Identifier))
+ERROR(unsupported_type_nested_in_generic_extension,none,
+      "type %0 cannot be nested in extension of generic type %1",
+      (Identifier, Identifier))
 ERROR(unsupported_type_nested_in_generic_function,none,
-      "type %0 nested in generic function %1 is not allowed",
+      "type %0 cannot be nested in generic function %1",
       (Identifier, Identifier))
+ERROR(unsupported_type_nested_in_protocol,none,
+      "type %0 cannot be nested in protocol %1",
+      (Identifier, Identifier))
+ERROR(unsupported_type_nested_in_protocol_extension,none,
+      "type %0 cannot be nested in protocol extension of %1",
+      (Identifier, Identifier))
+ERROR(unsupported_nested_protocol,none,
+      "protocol %0 cannot be nested inside another declaration",
+      (Identifier))
 
 // Type aliases
 ERROR(circular_type_alias,none,
@@ -1115,8 +1123,6 @@ ERROR(extension_constrained_inheritance,none,
       "inheritance clause", (Type))
 ERROR(extension_protocol_inheritance,none,
       "extension of protocol %0 cannot have an inheritance clause", (Type))
-ERROR(extension_protocol_type_definition,none,
-      "type %0 cannot be defined within a protocol extension", (DeclName))
 ERROR(extension_protocol_via_typealias,none,
       "protocol %0 in the module being compiled cannot be extended via a "
       "typealias", (Type))

include/swift/Parse/Parser.h

@@ -655,16 +655,15 @@ class Parser {
     PD_Default              = 0,
     PD_AllowTopLevel        = 1 << 1,
     PD_HasContainerType     = 1 << 2,
-    PD_DisallowNominalTypes = 1 << 3,
-    PD_DisallowInit         = 1 << 4,
-    PD_AllowDestructor      = 1 << 5,
-    PD_AllowEnumElement     = 1 << 6,
-    PD_InProtocol           = 1 << 7,
-    PD_InClass              = 1 << 8,
-    PD_InExtension          = 1 << 9,
-    PD_InStruct             = 1 << 10,
-    PD_InEnum               = 1 << 11,
-    PD_InLoop               = 1 << 12
+    PD_DisallowInit         = 1 << 3,
+    PD_AllowDestructor      = 1 << 4,
+    PD_AllowEnumElement     = 1 << 5,
+    PD_InProtocol           = 1 << 6,
+    PD_InClass              = 1 << 7,
+    PD_InExtension          = 1 << 8,
+    PD_InStruct             = 1 << 9,
+    PD_InEnum               = 1 << 10,
+    PD_InLoop               = 1 << 11
   };
 
   /// Options that control the parsing of declarations.
@@ -1240,7 +1239,15 @@ class Parser {
   ParserResult<GenericParamList> parseGenericParameters();
   ParserResult<GenericParamList> parseGenericParameters(SourceLoc LAngleLoc);
   ParserResult<GenericParamList> maybeParseGenericParams();
-  ParserStatus parseFreestandingGenericWhereClause(GenericParamList *&GPList);
+
+  enum class WhereClauseKind : unsigned {
+    Declaration,
+    Protocol,
+    AssociatedType
+  };
+  ParserStatus
+  parseFreestandingGenericWhereClause(GenericParamList *&GPList,
+                             WhereClauseKind kind=WhereClauseKind::Declaration);
 
   ParserStatus parseGenericWhereClause(SourceLoc &WhereLoc,
                                SmallVectorImpl<RequirementRepr> &Requirements,

include/swift/SIL/TypeLowering.h

@@ -380,12 +380,6 @@ struct SILConstantInfo {
     return SILType::getPrimitiveObjectType(SILFnType);
   }
 
-  ArrayRef<Substitution> getForwardingSubstitutions(ASTContext &C) {
-    if (!ContextGenericParams)
-      return { };
-    return ContextGenericParams->getForwardingSubstitutions(C);
-  }
-
   friend bool operator==(SILConstantInfo lhs, SILConstantInfo rhs) {
     return lhs.FormalInterfaceType == rhs.FormalInterfaceType &&
            lhs.LoweredInterfaceType == rhs.LoweredInterfaceType &&