NFC: Rename TypeWalker's SkipChildren to SkipNode

hamishknight · hamishknight · commit 05615fa0e44e · 2024-02-05T15:27:25.000Z
For consistency with ASTWalker.
diff --git a/include/swift/AST/TypeWalker.h b/include/swift/AST/TypeWalker.h
@@ -22,7 +22,7 @@ class TypeWalker {
 public:
   enum class Action {
     Continue,
-    SkipChildren,
+    SkipNode,
     Stop
   };
 
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
@@ -6269,7 +6269,7 @@ bool ClassDecl::walkSuperclasses(
     switch (fn(cls)) {
     case TypeWalker::Action::Stop:
       return true;
-    case TypeWalker::Action::SkipChildren:
+    case TypeWalker::Action::SkipNode:
       return false;
     case TypeWalker::Action::Continue:
       cls = cls->getSuperclassDecl();
@@ -6597,7 +6597,7 @@ bool ProtocolDecl::walkInheritedProtocols(
       }
       break;
 
-    case TypeWalker::Action::SkipChildren:
+    case TypeWalker::Action::SkipNode:
       break;
     }
   }
diff --git a/lib/AST/ParameterPack.cpp b/lib/AST/ParameterPack.cpp
@@ -109,7 +109,7 @@ struct PackReferenceCollector: TypeWalker {
       for (auto type : boundGenericType->getExpandedGenericArgs())
         type.walk(*this);
 
-      return Action::SkipChildren;
+      return Action::SkipNode;
     }
 
     if (auto *typeAliasType = dyn_cast<TypeAliasType>(t.getPointer())) {
@@ -120,7 +120,7 @@ struct PackReferenceCollector: TypeWalker {
         for (auto type : typeAliasType->getExpandedGenericArgs())
           type.walk(*this);
 
-        return Action::SkipChildren;
+        return Action::SkipNode;
       }
     }
 
diff --git a/lib/AST/RequirementMachine/GenericSignatureQueries.cpp b/lib/AST/RequirementMachine/GenericSignatureQueries.cpp
@@ -305,7 +305,7 @@ bool RequirementMachine::isReducedType(Type type) const {
 
     Action walkToTypePre(Type component) override {
       if (!component->hasTypeParameter())
-        return Action::SkipChildren;
+        return Action::SkipNode;
 
       if (!component->isTypeParameter())
         return Action::Continue;
@@ -327,7 +327,7 @@ bool RequirementMachine::isReducedType(Type type) const {
 
       // The parent of a reduced type parameter might be non-reduced
       // because it is concrete.
-      return Action::SkipChildren;
+      return Action::SkipNode;
     }
   };
 
diff --git a/lib/AST/RequirementMachine/RequirementLowering.cpp b/lib/AST/RequirementMachine/RequirementLowering.cpp
@@ -536,7 +536,7 @@ struct InferRequirementsWalker : public TypeWalker {
       return Action::Stop;
 
     if (!ty->hasTypeParameter())
-      return Action::SkipChildren;
+      return Action::SkipNode;
 
     return Action::Continue;
   }
diff --git a/lib/AST/TypeWalker.cpp b/lib/AST/TypeWalker.cpp
@@ -283,7 +283,7 @@ class Traversal : public TypeVisitor<Traversal, bool>
     switch (Walker.walkToTypePre(ty)) {
     case TypeWalker::Action::Continue:
       break;
-    case TypeWalker::Action::SkipChildren:
+    case TypeWalker::Action::SkipNode:
       return false;
     case TypeWalker::Action::Stop:
       return true;
@@ -297,7 +297,7 @@ class Traversal : public TypeVisitor<Traversal, bool>
     switch (Walker.walkToTypePost(ty)) {
     case TypeWalker::Action::Continue:
       return false;
-    case TypeWalker::Action::SkipChildren:
+    case TypeWalker::Action::SkipNode:
       llvm_unreachable("SkipChildren is not valid for a post-visit check");
     case TypeWalker::Action::Stop:
       return true;
diff --git a/lib/Frontend/ModuleInterfaceSupport.cpp b/lib/Frontend/ModuleInterfaceSupport.cpp
@@ -693,7 +693,7 @@ class InheritedProtocolCollector {
       proto->walkInheritedProtocols(
           [&](ProtocolDecl *inherited) -> TypeWalker::Action {
         if (!handledProtocols.insert(inherited).second)
-          return TypeWalker::Action::SkipChildren;
+          return TypeWalker::Action::SkipNode;
 
         // If 'nominal' is an actor, we do not synthesize its conformance
         // to the Actor protocol through a dummy extension.
@@ -702,14 +702,14 @@ class InheritedProtocolCollector {
         // not extensions of that 'actor'.
         if (actorClass &&
             inherited->isSpecificProtocol(KnownProtocolKind::Actor))
-          return TypeWalker::Action::SkipChildren;
+          return TypeWalker::Action::SkipNode;
 
         // Do not synthesize an extension to print a conformance to an
         // invertible protocol, as their conformances are always re-inferred
         // using the interface itself.
         if (auto kp = inherited->getKnownProtocolKind())
           if (getInvertibleProtocolKind(*kp))
-            return TypeWalker::Action::SkipChildren;
+            return TypeWalker::Action::SkipNode;
 
         if (inherited->isSPI() && printOptions.printPublicInterface())
           return TypeWalker::Action::Continue;
@@ -721,7 +721,7 @@ class InheritedProtocolCollector {
               inherited, availability, isUnchecked, otherAttrs);
           printSynthesizedExtension(out, extensionPrintOptions, M, nominal,
                                     protoAndAvailability);
-          return TypeWalker::Action::SkipChildren;
+          return TypeWalker::Action::SkipNode;
         }
 
         return TypeWalker::Action::Continue;
diff --git a/lib/PrintAsClang/ModuleContentsWriter.cpp b/lib/PrintAsClang/ModuleContentsWriter.cpp
@@ -61,7 +61,7 @@ class ReferencedTypeFinder : public TypeDeclFinder {
 
   Action visitNominalType(NominalType *nominal) override {
     Callback(*this, nominal->getDecl());
-    return Action::SkipChildren;
+    return Action::SkipNode;
   }
 
   Action visitTypeAliasType(TypeAliasType *aliasTy) override {
@@ -71,7 +71,7 @@ class ReferencedTypeFinder : public TypeDeclFinder {
     } else {
       Type(aliasTy->getSinglyDesugaredType()).walk(*this);
     }
-    return Action::SkipChildren;
+    return Action::SkipNode;
   }
 
   /// Returns true if \p paramTy has any constraints other than being
@@ -103,7 +103,7 @@ class ReferencedTypeFinder : public TypeDeclFinder {
       argTy.walk(*this);
       NeedsDefinition = false;
     });
-    return Action::SkipChildren;
+    return Action::SkipNode;
   }
 
 public:
diff --git a/lib/Sema/AssociatedTypeInference.cpp b/lib/Sema/AssociatedTypeInference.cpp
@@ -4400,7 +4400,7 @@ ReferencedAssociatedTypesRequest::evaluate(Evaluator &eval,
             assocTypes.push_back(assocType);
         }
 
-        return Action::SkipChildren;
+        return Action::SkipNode;
       }
 
       return Action::Continue;
diff --git a/lib/Sema/CSBindings.cpp b/lib/Sema/CSBindings.cpp
@@ -1072,7 +1072,7 @@ findInferableTypeVars(Type type,
 
     Action walkToTypePre(Type ty) override {
       if (ty->is<DependentMemberType>())
-        return Action::SkipChildren;
+        return Action::SkipNode;
 
       if (auto typeVar = ty->getAs<TypeVariableType>())
         typeVars.insert(typeVar);
diff --git a/lib/Sema/ConstraintSystem.cpp b/lib/Sema/ConstraintSystem.cpp
@@ -7275,16 +7275,16 @@ static bool doesMemberHaveUnfulfillableConstraintsWithExistentialBase(
       }
 
       if (ty->getRootGenericParam()->getDepth() > 0) {
-        return Action::SkipChildren;
+        return Action::SkipNode;
       }
 
       if (!Sig->isValidTypeParameter(ty)) {
-        return Action::SkipChildren;
+        return Action::SkipNode;
       }
 
       const auto concreteTy = Sig->getConcreteType(ty);
       if (concreteTy && !concreteTy->hasTypeParameter()) {
-        return Action::SkipChildren;
+        return Action::SkipNode;
       }
 
       return Action::Stop;
diff --git a/lib/Sema/TypeCheckCaptures.cpp b/lib/Sema/TypeCheckCaptures.cpp
@@ -109,7 +109,7 @@ class FindCapturedVars : public ASTWalker {
         if (ObjC) {
           if (auto clazz = dyn_cast_or_null<ClassDecl>(ty->getAnyNominal())) {
             if (clazz->isTypeErasedGenericClass()) {
-              return Action::SkipChildren;
+              return Action::SkipNode;
             }
           }
         }
diff --git a/lib/Sema/TypeCheckDeclOverride.cpp b/lib/Sema/TypeCheckDeclOverride.cpp
@@ -2220,7 +2220,7 @@ computeOverriddenAssociatedTypes(AssociatedTypeDecl *assocType) {
       foundAny = true;
     }
 
-    return foundAny ? TypeWalker::Action::SkipChildren
+    return foundAny ? TypeWalker::Action::SkipNode
                     : TypeWalker::Action::Continue;
   });
 
diff --git a/lib/Sema/TypeCheckGeneric.cpp b/lib/Sema/TypeCheckGeneric.cpp
@@ -336,18 +336,18 @@ void TypeChecker::checkReferencedGenericParams(GenericContext *dc) {
       // Find generic parameters or dependent member types.
       // Once such a type is found, don't recurse into its children.
       if (!ty->hasTypeParameter())
-        return Action::SkipChildren;
+        return Action::SkipNode;
       if (ty->isTypeParameter()) {
         ReferencedGenericParams.insert(ty->getCanonicalType());
-        return Action::SkipChildren;
+        return Action::SkipNode;
       }
 
       // Skip the count type, which is always a generic parameter;
       // we don't consider it a reference because it only binds the
       // shape and not the metadata.
       if (auto *expansionTy = ty->getAs<PackExpansionType>()) {
         expansionTy->getPatternType().walk(*this);
-        return Action::SkipChildren;
+        return Action::SkipNode;
       }
 
       // Don't walk into generic type alias substitutions. This does
@@ -357,7 +357,7 @@ void TypeChecker::checkReferencedGenericParams(GenericContext *dc) {
       //   func foo<T>(_: Foo<T>) {}
       if (auto *aliasTy = dyn_cast<TypeAliasType>(ty.getPointer())) {
         Type(aliasTy->getSinglyDesugaredType()).walk(*this);
-        return Action::SkipChildren;
+        return Action::SkipNode;
       }
 
       return Action::Continue;
diff --git a/lib/Sema/TypeCheckProtocol.cpp b/lib/Sema/TypeCheckProtocol.cpp
@@ -4610,7 +4610,7 @@ hasInvariantSelfRequirement(const ProtocolDecl *proto,
 
         // 'Self.A' is OK.
         if (ty->is<DependentMemberType>())
-          return Action::SkipChildren;
+          return Action::SkipNode;
 
         return Action::Continue;
       }
@@ -4889,19 +4889,19 @@ hasInvalidTypeInConformanceContext(const ValueDecl *requirement,
 
     Action walkToTypePre(Type ty) override {
       if (!ty->hasTypeParameter())
-        return Action::SkipChildren;
+        return Action::SkipNode;
 
       auto *const dmt = ty->getAs<DependentMemberType>();
       if (!dmt)
         return Action::Continue;
 
       // We only care about 'Self'-rooted type parameters.
       if (!dmt->getRootGenericParam()->isEqual(Proto->getSelfInterfaceType()))
-        return Action::SkipChildren;
+        return Action::SkipNode;
 
       if (ty.subst(Subs)->hasError())
         return Action::Stop;
-      return Action::SkipChildren;
+      return Action::SkipNode;
     }
   };
 

Original file line number	Diff line number	Diff line change
`@@ -6269,7 +6269,7 @@ bool ClassDecl::walkSuperclasses(`
`6269`	`6269`	`switch (fn(cls)) {`
`6270`	`6270`	`case TypeWalker::Action::Stop:`
`6271`	`6271`	`return true;`
`6272`		`- case TypeWalker::Action::SkipChildren:`
	`6272`	`+ case TypeWalker::Action::SkipNode:`
`6273`	`6273`	`return false;`
`6274`	`6274`	`case TypeWalker::Action::Continue:`
`6275`	`6275`	`cls = cls->getSuperclassDecl();`
`@@ -6597,7 +6597,7 @@ bool ProtocolDecl::walkInheritedProtocols(`
`6597`	`6597`	`}`
`6598`	`6598`	`break;`
`6599`	`6599`
`6600`		`- case TypeWalker::Action::SkipChildren:`
	`6600`	`+ case TypeWalker::Action::SkipNode:`
`6601`	`6601`	`break;`
`6602`	`6602`	`}`
`6603`	`6603`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ struct PackReferenceCollector: TypeWalker {`
`109`	`109`	`for (auto type : boundGenericType->getExpandedGenericArgs())`
`110`	`110`	`type.walk(*this);`
`111`	`111`
`112`		`- return Action::SkipChildren;`
	`112`	`+ return Action::SkipNode;`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`if (auto *typeAliasType = dyn_cast<TypeAliasType>(t.getPointer())) {`
`@@ -120,7 +120,7 @@ struct PackReferenceCollector: TypeWalker {`
`120`	`120`	`for (auto type : typeAliasType->getExpandedGenericArgs())`
`121`	`121`	`type.walk(*this);`
`122`	`122`
`123`		`- return Action::SkipChildren;`
	`123`	`+ return Action::SkipNode;`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -536,7 +536,7 @@ struct InferRequirementsWalker : public TypeWalker {`
`536`	`536`	`return Action::Stop;`
`537`	`537`
`538`	`538`	`if (!ty->hasTypeParameter())`
`539`		`- return Action::SkipChildren;`
	`539`	`+ return Action::SkipNode;`
`540`	`540`
`541`	`541`	`return Action::Continue;`
`542`	`542`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class ReferencedTypeFinder : public TypeDeclFinder {`
`61`	`61`
`62`	`62`	`Action visitNominalType(NominalType *nominal) override {`
`63`	`63`	`Callback(*this, nominal->getDecl());`
`64`		`- return Action::SkipChildren;`
	`64`	`+ return Action::SkipNode;`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`Action visitTypeAliasType(TypeAliasType *aliasTy) override {`
`@@ -71,7 +71,7 @@ class ReferencedTypeFinder : public TypeDeclFinder {`
`71`	`71`	`} else {`
`72`	`72`	`Type(aliasTy->getSinglyDesugaredType()).walk(*this);`
`73`	`73`	`}`
`74`		`- return Action::SkipChildren;`
	`74`	`+ return Action::SkipNode;`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/// Returns true if \p paramTy has any constraints other than being`
`@@ -103,7 +103,7 @@ class ReferencedTypeFinder : public TypeDeclFinder {`
`103`	`103`	`argTy.walk(*this);`
`104`	`104`	`NeedsDefinition = false;`
`105`	`105`	`});`
`106`		`- return Action::SkipChildren;`
	`106`	`+ return Action::SkipNode;`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`public:`
Original file line number	Diff line number	Diff line change
`@@ -4400,7 +4400,7 @@ ReferencedAssociatedTypesRequest::evaluate(Evaluator &eval,`
`4400`	`4400`	`assocTypes.push_back(assocType);`
`4401`	`4401`	`}`
`4402`	`4402`
`4403`		`- return Action::SkipChildren;`
	`4403`	`+ return Action::SkipNode;`
`4404`	`4404`	`}`
`4405`	`4405`
`4406`	`4406`	`return Action::Continue;`