GSB: ignore generic types in expandConformanceRequirement

Fixes crashes in 28437-swift-typechecker-validatedecl.swift (from previous commit) and the compiler crasher 28861-gpdecl-getdepth-generictypeparamdecl- invaliddepth-parameter-hasnt-been-validated.swift.
athas · Apr 30, 2019 · bddb40d · bddb40d
1 parent c27dca3
commit bddb40d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/AST/GenericSignatureBuilder.cpp b/lib/AST/GenericSignatureBuilder.cpp
@@ -4163,8 +4163,14 @@ ConstraintResult GenericSignatureBuilder::expandConformanceRequirement(
       if (inheritedProto == proto) return TypeWalker::Action::Continue;
 
       for (auto req : inheritedProto->getMembers()) {
-        if (auto typeReq = dyn_cast<TypeDecl>(req))
+        if (auto typeReq = dyn_cast<TypeDecl>(req)) {
+          // Ignore generic types
+          if (auto genReq = dyn_cast<GenericTypeDecl>(req))
+            if (genReq->getGenericParams())
+              continue;
+
           inheritedTypeDecls[typeReq->getFullName()].push_back(typeReq);
+        }
       }
       return TypeWalker::Action::Continue;
     });

diff --git a/...epth-parameter-hasnt-been-validated.swift → ...epth-parameter-hasnt-been-validated.swift b/...epth-parameter-hasnt-been-validated.swift → ...epth-parameter-hasnt-been-validated.swift
@@ -6,6 +6,6 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 // REQUIRES: asserts
-// RUN: not --crash %target-swift-frontend %s -emit-ir
+// RUN: not %target-swift-frontend %s -emit-ir
 protocol
 P{protocol A:P{{}}typealias e:A{}class a<a{}class a