EscapeUtils: make hasRelevantType configurable in the EscapeVisitor

Author: eeckstein

SwiftCompilerSources/Sources/Optimizer/Utilities/EscapeUtils.swift

@@ -177,15 +177,29 @@ protocol EscapeVisitor {
 
   /// Called during the UseDef walk for each definition
   mutating func visitDef(def: Value, path: EscapePath) -> DefResult
+  
+  /// Returns true if the type of `value` at `path` is relevant and should be tracked.
+  func hasRelevantType(_ value: Value, at path: SmallProjectionPath, analyzeAddresses: Bool) -> Bool
 }
 
 extension EscapeVisitor {
   mutating func visitUse(operand: Operand, path: EscapePath) -> UseResult {
     return .continueWalk
   }
+
   mutating func visitDef(def: Value, path: EscapePath) -> DefResult {
     return .continueWalkUp
   }
+
+  func hasRelevantType(_ value: Value, at path: SmallProjectionPath, analyzeAddresses: Bool) -> Bool {
+    let type = value.type
+    if type.isNonTrivialOrContainsRawPointer(in: value.function) { return true }
+    
+    // For selected addresses we also need to consider trivial types (`value`
+    // is a selected address if the path does not contain any class projections).
+    if analyzeAddresses && type.isAddress && !path.hasClassProjection { return true }
+    return false
+  }
 }
 
 /// A visitor which returns a `result`.
@@ -360,7 +374,7 @@ fileprivate struct EscapeWalker<V: EscapeVisitor> : ValueDefUseWalker,
   }
 
   mutating func walkDown(value: Operand, path: Path) -> WalkResult {
-    if hasRelevantType(value.value, at: path.projectionPath) {
+    if visitor.hasRelevantType(value.value, at: path.projectionPath, analyzeAddresses: analyzeAddresses) {
       switch visitor.visitUse(operand: value, path: path) {
       case .continueWalk:
         return walkDownDefault(value: value, path: path)
@@ -456,7 +470,7 @@ fileprivate struct EscapeWalker<V: EscapeVisitor> : ValueDefUseWalker,
   }
 
   mutating func walkDown(address: Operand, path: Path) -> WalkResult {
-    if hasRelevantType(address.value, at: path.projectionPath) {
+    if visitor.hasRelevantType(address.value, at: path.projectionPath, analyzeAddresses: analyzeAddresses) {
       switch visitor.visitUse(operand: address, path: path) {
       case .continueWalk:
         return walkDownDefault(address: address, path: path)
@@ -691,7 +705,7 @@ fileprivate struct EscapeWalker<V: EscapeVisitor> : ValueDefUseWalker,
   }
 
   mutating func walkUp(value: Value, path: Path) -> WalkResult {
-    if hasRelevantType(value, at: path.projectionPath) {
+    if visitor.hasRelevantType(value, at: path.projectionPath, analyzeAddresses: analyzeAddresses) {
       switch visitor.visitDef(def: value, path: path) {
       case .continueWalkUp:
         return walkUpDefault(value: value, path: path)
@@ -736,7 +750,7 @@ fileprivate struct EscapeWalker<V: EscapeVisitor> : ValueDefUseWalker,
   }
 
   mutating func walkUp(address: Value, path: Path) -> WalkResult {
-    if hasRelevantType(address, at: path.projectionPath) {
+    if visitor.hasRelevantType(address, at: path.projectionPath, analyzeAddresses: analyzeAddresses) {
       switch visitor.visitDef(def: address, path: path) {
       case .continueWalkUp:
         return walkUpDefault(address: address, path: path)
@@ -833,17 +847,6 @@ fileprivate struct EscapeWalker<V: EscapeVisitor> : ValueDefUseWalker,
   //                          private utility functions
   //===--------------------------------------------------------------------===//
 
-  /// Returns true if the type of `value` at `path` is relevant and should be tracked.
-  private func hasRelevantType(_ value: Value, at path: SmallProjectionPath) -> Bool {
-    let type = value.type
-    if type.isNonTrivialOrContainsRawPointer(in: value.function) { return true }
-    
-    // For selected addresses we also need to consider trivial types (`value`
-    // is a selected address if the path does not contain any class projections).
-    if analyzeAddresses && type.isAddress && !path.hasClassProjection { return true }
-    return false
-  }
-
   /// Returns true if the selected address/value at `path` can be ignored for loading from
   /// that address or for passing that address/value to a called function.
   ///
@@ -867,7 +870,7 @@ fileprivate struct EscapeWalker<V: EscapeVisitor> : ValueDefUseWalker,
   /// Tries to pop the given projection from path, if the projected `value` has a relevant type.
   private func pop(_ kind: Path.FieldKind, index: Int? = nil, from path: Path, yielding value: Value) -> Path? {
     if let newPath = path.popIfMatches(kind, index: index),
-       hasRelevantType(value, at: newPath.projectionPath) {
+       visitor.hasRelevantType(value, at: newPath.projectionPath, analyzeAddresses: analyzeAddresses) {
       return newPath
     }
     return nil