AST: TypeWalker walks into substitutions of local archetypes

Author: slavapestov

lib/AST/TypeWalker.cpp

@@ -16,6 +16,7 @@
 
 #include "swift/AST/TypeWalker.h"
 #include "swift/AST/TypeVisitor.h"
+#include "swift/AST/GenericEnvironment.h"
 #include "swift/Basic/Assertions.h"
 
 using namespace swift;
@@ -235,17 +236,39 @@ class Traversal : public TypeVisitor<Traversal, bool>
 
     return false;
   }
-  
-  bool visitArchetypeType(ArchetypeType *ty) {
-    // If the root is an opaque archetype, visit its substitution replacement
-    // types.
-    if (auto opaque = dyn_cast<OpaqueTypeArchetypeType>(ty)) {
-      for (auto arg : opaque->getSubstitutions().getReplacementTypes()) {
-        if (doIt(arg)) {
-          return true;
-        }
+
+  bool visitPrimaryArchetypeType(PrimaryArchetypeType *ty) {
+    return false;
+  }
+
+  bool visitPackArchetypeType(PackArchetypeType *ty) {
+    return false;
+  }
+
+  bool visitOpaqueTypeArchetypeType(OpaqueTypeArchetypeType *opaque) {
+    auto *env = opaque->getGenericEnvironment();
+    for (auto arg : env->getOuterSubstitutions().getReplacementTypes()) {
+      if (doIt(arg)) {
+        return true;
       }
     }
+
+    return false;
+  }
+
+  bool visitOpenedArchetypeType(OpenedArchetypeType *opened) {
+    auto *env = opened->getGenericEnvironment();
+    for (auto arg : env->getOuterSubstitutions().getReplacementTypes()) {
+      if (doIt(arg)) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  bool visitElementArchetypeType(ElementArchetypeType *element) {
+    // FIXME: Visit element type substitutions here
     return false;
   }