Merge pull request #926 from jtbandes/innermost-params

[AST] Fix inconsistent handling of generic args & params during BoundGenericType::getSubstitutions

Author: slavapestov

include/swift/AST/Decl.h

@@ -2827,12 +2827,12 @@ class NominalTypeDecl : public TypeDecl, public DeclContext,
   /// Set the generic signature of this type.
   void setGenericSignature(GenericSignature *sig);
 
-  /// Retrieve the generic parameter types.
-  ArrayRef<GenericTypeParamType *> getGenericParamTypes() const {
+  /// Retrieve the innermost generic parameter types.
+  ArrayRef<GenericTypeParamType *> getInnermostGenericParamTypes() const {
     if (!GenericSig)
       return { };
 
-    return GenericSig->getGenericParams();
+    return GenericSig->getInnermostGenericParams();
   }
 
   /// Retrieve the generic requirements.

lib/AST/Decl.cpp

@@ -1745,9 +1745,9 @@ Type ValueDecl::getInterfaceType() const {
     auto proto = cast<ProtocolDecl>(getDeclContext());
     (void)proto->getType(); // make sure we've computed the type.
     // FIXME: the generic parameter types list should never be empty.
-    auto selfTy = proto->getGenericParamTypes().empty()
+    auto selfTy = proto->getInnermostGenericParamTypes().empty()
                     ? proto->getProtocolSelf()->getType()
-                    : proto->getGenericParamTypes().back();
+                    : proto->getInnermostGenericParamTypes().back();
     auto &ctx = getASTContext();
     InterfaceTy = DependentMemberType::get(
                     selfTy,

lib/IDE/CodeCompletion.cpp

@@ -1258,7 +1258,7 @@ ArchetypeTransformer::ArchetypeTransformer(DeclContext *DC, Type Ty) :
   if (!D)
     return;
   SmallVector<Type, 3> Scrach;
-  auto Params = D->getGenericParamTypes();
+  auto Params = D->getInnermostGenericParamTypes();
   auto Args = BaseTy->getAllGenericArgs(Scrach);
   assert(Params.size() == Args.size());
   for (unsigned I = 0, N = Params.size(); I < N; I ++) {

lib/Sema/CSGen.cpp

@@ -2883,7 +2883,8 @@ bool swift::isExtensionApplied(DeclContext &DC, Type BaseTy,
   SmallVector<Type, 3> Scratch;
   auto genericArgs = BaseTy->getAllGenericArgs(Scratch);
   TypeSubstitutionMap substitutions;
-  auto genericParams = BaseTy->getNominalOrBoundGenericNominal()->getGenericParamTypes();
+  auto genericParams = BaseTy->getNominalOrBoundGenericNominal()
+                         ->getInnermostGenericParamTypes();
   assert(genericParams.size() == genericArgs.size());
   for (unsigned i = 0, n = genericParams.size(); i != n; ++i) {
     auto gp = genericParams[i]->getCanonicalType()->castTo<GenericTypeParamType>();

lib/Sema/ConstraintSystem.cpp

@@ -603,7 +603,7 @@ namespace {
 
         // Open up the generic type.
         cs.openGeneric(unboundDecl,
-                       unboundDecl->getGenericParamTypes(),
+                       unboundDecl->getInnermostGenericParamTypes(),
                        unboundDecl->getGenericRequirements(),
                        /*skipProtocolSelfConstraint=*/false,
                        minOpeningDepth,
@@ -612,7 +612,7 @@ namespace {
 
         // Map the generic parameters to their corresponding type variables.
         llvm::SmallVector<Type, 4> arguments;
-        for (auto gp : unboundDecl->getGenericParamTypes()) {
+        for (auto gp : unboundDecl->getInnermostGenericParamTypes()) {
           assert(replacements.count(gp->getCanonicalType()) && 
                  "Missing generic parameter?");
           arguments.push_back(replacements[gp->getCanonicalType()]);

test/Generics/generic_types.swift

@@ -317,7 +317,7 @@ class Bottom<T : Bottom<Top>> {} // expected-error 2{{type may not reference its
 class X6<T> {
   let d: D<T>
   init(_ value: T) {
-    d = D(value) // expected-error{{cannot invoke initializer for type 'X6<T>.D<_, _>' with an argument list of type '(T)'}} expected-note{{expected an argument list of type '(T2)'}}
+    d = D(value)
   }
   class D<T2> { // expected-error{{generic type 'D' nested in type 'X6' is not allowed}}
     init(_ value: T2) {}

validation-test/IDE/crashers/043-swift-boundgenerictype-getsubstitutions.swift

@@ -0,0 +1,2 @@
+// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s
+class A<h{#^A^#class B<a{let:AnyObject.Type=B

validation-test/IDE/crashers_fixed/043-swift-boundgenerictype-getsubstitutions.swift

@@ -1,4 +1,4 @@
-// RUN: not --crash %target-swift-frontend %s -parse
+// RUN: not %target-swift-frontend %s -parse
 
 // Distributed under the terms of the MIT license
 // Test case submitted to project by https://github.com/practicalswift (practicalswift)

validation-test/compiler_crashers/24558-swift-typebase-gatherallsubstitutions.swift renamed to validation-test/compiler_crashers_fixed/24558-swift-typebase-gatherallsubstitutions.swift

@@ -1,4 +1,4 @@
-// RUN: not --crash %target-swift-frontend %s -parse
+// RUN: not %target-swift-frontend %s -parse
 
 // Distributed under the terms of the MIT license
 // Test case submitted to project by https://github.com/practicalswift (practicalswift)

validation-test/compiler_crashers/24624-swift-module-lookupconformance.swift renamed to validation-test/compiler_crashers_fixed/24624-swift-module-lookupconformance.swift

@@ -1,4 +1,4 @@
-// RUN: not --crash %target-swift-frontend %s -parse
+// RUN: not %target-swift-frontend %s -parse
 
 // Distributed under the terms of the MIT license
 // Test case submitted to project by https://github.com/practicalswift (practicalswift)

validation-test/compiler_crashers/24800-swift-constraints-constraintsystem-matchsuperclasstypes.swift renamed to validation-test/compiler_crashers_fixed/24800-swift-constraints-constraintsystem-matchsuperclasstypes.swift

@@ -1,4 +1,4 @@
-// RUN: not --crash %target-swift-frontend %s -parse
+// RUN: not %target-swift-frontend %s -parse
 
 // Distributed under the terms of the MIT license
 // Test case submitted to project by https://github.com/practicalswift (practicalswift)

validation-test/compiler_crashers/27367-swift-boundgenerictype-getsubstitutions.swift renamed to validation-test/compiler_crashers_fixed/27367-swift-boundgenerictype-getsubstitutions.swift

@@ -1,4 +1,4 @@
-// RUN: not --crash %target-swift-frontend %s -parse
+// RUN: not %target-swift-frontend %s -parse
 
 // Distributed under the terms of the MIT license
 // Test case submitted to project by https://github.com/practicalswift (practicalswift)

validation-test/compiler_crashers/27426-swift-typechecker-validatedecl.swift renamed to validation-test/compiler_crashers_fixed/27426-swift-typechecker-validatedecl.swift

@@ -1,4 +1,4 @@
-// RUN: not --crash %target-swift-frontend %s -parse
+// RUN: not %target-swift-frontend %s -parse
 
 // Distributed under the terms of the MIT license
 // Test case submitted to project by https://github.com/practicalswift (practicalswift)

validation-test/compiler_crashers/27499-llvm-bitstreamcursor-read.swift renamed to validation-test/compiler_crashers_fixed/27499-llvm-bitstreamcursor-read.swift

@@ -1,4 +1,4 @@
-// RUN: not --crash %target-swift-frontend %s -parse
+// RUN: not %target-swift-frontend %s -parse
 
 // Distributed under the terms of the MIT license
 // Test case submitted to project by https://github.com/practicalswift (practicalswift)

validation-test/compiler_crashers/27743-swift-constraints-constraintsystem-solvesimplified.swift renamed to validation-test/compiler_crashers_fixed/27743-swift-constraints-constraintsystem-solvesimplified.swift

@@ -1,4 +1,4 @@
-// RUN: not --crash %target-swift-frontend %s -parse
+// RUN: not %target-swift-frontend %s -parse
 
 // Distributed under the terms of the MIT license
 // Test case submitted to project by https://github.com/practicalswift (practicalswift)