Merge pull request #80284 from eeckstein/diagnose-infinite-recursion

DiagnoseInfiniteRecursion: re-implement the pass in swift and fix a bug

Author: eeckstein

SwiftCompilerSources/Sources/AST/Conformance.swift

@@ -60,6 +60,16 @@ public struct Conformance: CustomStringConvertible, NoReflectionChildren {
     return bridged.getInheritedConformance().conformance
   }
 
+  public var rootConformance: Conformance {
+    if isInherited {
+      return inheritedConformance.rootConformance
+    }
+    if isSpecialized {
+      return genericConformance
+    }
+    return self
+  }
+
   public var specializedSubstitutions: SubstitutionMap {
     assert(isSpecialized)
     return SubstitutionMap(bridged: bridged.getSpecializedSubstitutions())

SwiftCompilerSources/Sources/AST/Declarations.swift

@@ -20,6 +20,9 @@ public class Decl: CustomStringConvertible, Hashable {
 
   public var description: String { String(taking: bridged.getDebugDescription()) }
 
+  /// The module in which this declaration resides.
+  public var parentModule: ModuleDecl { bridged.getModuleContext().getAs(ModuleDecl.self) }
+
   // True if this declaration is imported from C/C++/ObjC.
   public var hasClangNode: Bool { bridged.hasClangNode() }
 
@@ -88,7 +91,9 @@ final public class ParamDecl: VarDecl {}
 
 final public class SubscriptDecl: AbstractStorageDecl {}
 
-public class AbstractFunctionDecl: ValueDecl {}
+public class AbstractFunctionDecl: ValueDecl {
+  public var isOverridden: Bool { bridged.AbstractFunction_isOverridden() }
+}
 
 final public class ConstructorDecl: AbstractFunctionDecl {}
 

SwiftCompilerSources/Sources/AST/GenericSignature.swift

@@ -25,4 +25,8 @@ public struct GenericSignature: CustomStringConvertible, NoReflectionChildren {
   public var description: String {
     return String(taking: bridged.getDebugDescription())
   }
+
+  public var genericParameters: TypeArray {
+    TypeArray(bridged: bridged.getGenericParams())
+  }
 }

SwiftCompilerSources/Sources/AST/SubstitutionMap.swift

@@ -24,11 +24,11 @@ public struct SubstitutionMap: CustomStringConvertible, NoReflectionChildren {
   public init(bridged: BridgedSubstitutionMap) {
     self.bridged = bridged
   }
-  
+
   public init() {
     self.bridged = BridgedSubstitutionMap()
   }
-  
+
   public init(genericSignature: GenericSignature, replacementTypes: [Type]) {
     let bridgedReplTypes = replacementTypes.map { $0.bridged }
     self.bridged = bridgedReplTypes.withBridgedArrayRef {
@@ -73,4 +73,8 @@ public struct SubstitutionMap: CustomStringConvertible, NoReflectionChildren {
     assert(replacementTypes.count == 1)
     return replacementTypes[0]
   }
+
+  public static func ==(lhs: SubstitutionMap, rhs: SubstitutionMap) -> Bool {
+    lhs.bridged.isEqualTo(rhs.bridged)
+  }
 }

SwiftCompilerSources/Sources/AST/Type.swift

@@ -40,7 +40,7 @@ public struct Type: TypeProperties, CustomStringConvertible, NoReflectionChildre
     self.bridged = bridgedOrNil
   }
 
-  init(bridged: BridgedASTType) {
+  public init(bridged: BridgedASTType) {
     self.bridged = bridged
   }
 
@@ -162,6 +162,20 @@ extension TypeProperties {
     return false
   }
 
+  //===--------------------------------------------------------------------===//
+  //                Properties of lowered `SILFunctionType`s
+  //===--------------------------------------------------------------------===//
+
+  public var isLoweredFunction: Bool { rawType.bridged.isLoweredFunction() }
+  public var isNoEscapeFunction: Bool { rawType.bridged.isNoEscapeFunction() }
+  public var isCalleeConsumedFunction: Bool { rawType.bridged.isCalleeConsumedFunction() }
+  public var isThickFunction: Bool { rawType.bridged.isThickFunction() }
+  public var isAsyncFunction: Bool { rawType.bridged.isAsyncFunction() }
+
+  public var invocationGenericSignatureOfFunction: GenericSignature {
+    GenericSignature(bridged: rawType.bridged.getInvocationGenericSignatureOfFunctionType())
+  }
+
   //===--------------------------------------------------------------------===//
   //                             Type properties
   //===--------------------------------------------------------------------===//

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/CMakeLists.txt

@@ -18,6 +18,7 @@ swift_compiler_sources(Optimizer
   DeadStoreElimination.swift
   DeinitDevirtualizer.swift
   DestroyHoisting.swift
+  DiagnoseInfiniteRecursion.swift
   InitializeStaticGlobals.swift
   LetPropertyLowering.swift
   LifetimeDependenceDiagnostics.swift