SIL: Split up Function.loweredFunctionType/InContext

Author: slavapestov

SwiftCompilerSources/Sources/SIL/Function.swift

@@ -60,16 +60,19 @@ final public class Function : CustomStringConvertible, HasShortDescription, Hash
 
   public var hasLoweredAddresses: Bool { bridged.hasLoweredAddresses() }
 
-  /// The lowered function type in the expansion context of self.
+  public var loweredFunctionType: CanonicalType {
+    CanonicalType(bridged: bridged.getLoweredFunctionType())
+  }
+
+  /// The lowered function type, with opaque archetypes erased.
   ///
-  /// Always expanding a function type means that the opaque result types
-  /// have the correct generic signature. For example:
+  /// For example:
   ///    @substituted <τ_0_0> () -> @out τ_0_0 for <some P>
   /// is lowered to this inside its module:
   ///    @substituted <τ_0_0> () -> @out τ_0_0 for <ActualResultType>
   /// and this outside its module
   ///    @substituted <τ_0_0> () -> @out τ_0_0 for <some P>
-  public var loweredFunctionType: CanonicalType {
+  public var loweredFunctionTypeInContext: CanonicalType {
     CanonicalType(bridged: bridged.getLoweredFunctionTypeInContext())
   }
 
@@ -354,7 +357,7 @@ public func != (lhs: Function, rhs: Function) -> Bool { lhs !== rhs }
 // Function conventions.
 extension Function {
   public var convention: FunctionConvention {
-    FunctionConvention(for: loweredFunctionType, in: self)
+    FunctionConvention(for: loweredFunctionTypeInContext, in: self)
   }
 
   public var argumentConventions: ArgumentConventions {

include/swift/SIL/SILBridging.h

@@ -486,6 +486,7 @@ struct BridgedFunction {
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedStringRef getAccessorName() const;
   BRIDGED_INLINE bool hasOwnership() const;
   BRIDGED_INLINE bool hasLoweredAddresses() const;
+  SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedCanType getLoweredFunctionType() const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedCanType getLoweredFunctionTypeInContext() const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedGenericSignature getGenericSignature() const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedSubstitutionMap getForwardingSubstitutionMap() const;

include/swift/SIL/SILBridgingImpl.h

@@ -705,6 +705,10 @@ bool BridgedFunction::hasOwnership() const { return getFunction()->hasOwnership(
 
 bool BridgedFunction::hasLoweredAddresses() const { return getFunction()->getModule().useLoweredAddresses(); }
 
+BridgedCanType BridgedFunction::getLoweredFunctionType() const {
+  return getFunction()->getLoweredFunctionType();
+}
+
 BridgedCanType BridgedFunction::getLoweredFunctionTypeInContext() const {
   return getFunction()->getLoweredFunctionTypeInContext();
 }