Lift GenericSignature::hasTypeVariable

Author: CodaFi

include/swift/AST/GenericSignature.h

@@ -195,6 +195,9 @@ class GenericSignature {
 
   /// Retrieve the requirements.
   ArrayRef<Requirement> getRequirements() const;
+
+  /// Whether this generic signature involves a type variable.
+  bool hasTypeVariable() const;
 };
 
 /// A reference to a canonical generic signature.
@@ -424,9 +427,6 @@ class alignas(1 << TypeAlignInBits) GenericSignatureImpl final
   /// generic parameter types by their sugared form.
   Type getSugaredType(Type type) const;
 
-  /// Whether this generic signature involves a type variable.
-  bool hasTypeVariable() const;
-
   static void Profile(llvm::FoldingSetNodeID &ID,
                       TypeArrayView<GenericTypeParamType> genericParams,
                       ArrayRef<Requirement> requirements);

lib/AST/ASTContext.cpp

@@ -1775,8 +1775,8 @@ static AllocationArena getArena(GenericSignature genericSig) {
   if (!genericSig)
     return AllocationArena::Permanent;
 
-  if (genericSig->hasTypeVariable()) {
-    assert(false && "What's going on");
+  if (genericSig.hasTypeVariable()) {
+    assert(false && "Unsubstituted type variable leaked into generic signature");
     return AllocationArena::ConstraintSolver;
   }
 

lib/AST/GenericSignature.cpp

@@ -1272,7 +1272,7 @@ unsigned GenericSignatureImpl::getGenericParamOrdinal(
   return GenericParamKey(param).findIndexIn(getGenericParams());
 }
 
-bool GenericSignatureImpl::hasTypeVariable() const {
+bool GenericSignature::hasTypeVariable() const {
   return GenericSignature::hasTypeVariable(getRequirements());
 }