Swift SIL: make isLegalFormalType available in AST.Type

Author: eeckstein

SwiftCompilerSources/Sources/AST/Type.swift

@@ -84,6 +84,7 @@ public protocol TypeProperties {
 extension TypeProperties {
   public var description: String { String(taking: type.bridged.getDebugDescription()) }
 
+  public var isLegalFormalType: Bool { type.bridged.isLegalFormalType() }
   public var hasTypeParameter: Bool { type.bridged.hasTypeParameter() }
   public var hasLocalArchetype: Bool { type.bridged.hasLocalArchetype() }
   public var isExistentialArchetype: Bool { type.bridged.isExistentialArchetype() }

SwiftCompilerSources/Sources/SIL/Type.swift

@@ -104,7 +104,7 @@ public struct Type : CustomStringConvertible, NoReflectionChildren {
   public var isBuiltinVector: Bool { bridged.isBuiltinVector() }
   public var builtinVectorElementType: Type { bridged.getBuiltinVectorElementType().type }
 
-  public var isLegalFormalType: Bool { bridged.isLegalFormalType() }
+  public var isLegalFormalType: Bool { astType.isLegalFormalType }
 
   public func isBuiltinInteger(withFixedWidth width: Int) -> Bool {
     bridged.isBuiltinFixedWidthInteger(width)

include/swift/AST/ASTBridging.h

@@ -3004,6 +3004,7 @@ struct BridgedASTType {
   BRIDGED_INLINE swift::Type unbridged() const;
   BRIDGED_INLINE BridgedOwnedString getDebugDescription() const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedCanType getCanonicalType() const;
+  BRIDGED_INLINE bool isLegalFormalType() const;
   BRIDGED_INLINE bool hasTypeParameter() const;
   BRIDGED_INLINE bool hasLocalArchetype() const;
   BRIDGED_INLINE bool isExistentialArchetype() const;

include/swift/AST/ASTBridgingImpl.h

@@ -398,6 +398,10 @@ BridgedCanType BridgedASTType::getCanonicalType() const {
   return unbridged()->getCanonicalType();
 }
 
+bool BridgedASTType::isLegalFormalType() const {
+  return unbridged()->isLegalFormalType();
+}
+
 bool BridgedASTType::hasTypeParameter() const {
   return unbridged()->hasTypeParameter();
 }

include/swift/SIL/SILBridging.h

@@ -275,7 +275,6 @@ struct BridgedType {
   BRIDGED_INLINE bool isBuiltinInteger() const;
   BRIDGED_INLINE bool isBuiltinFloat() const;
   BRIDGED_INLINE bool isBuiltinVector() const;
-  BRIDGED_INLINE bool isLegalFormalType() const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedType getBuiltinVectorElementType() const;
   BRIDGED_INLINE bool isBuiltinFixedWidthInteger(SwiftInt width) const;
   BRIDGED_INLINE bool isExactSuperclassOf(BridgedType t) const;

include/swift/SIL/SILBridgingImpl.h

@@ -450,10 +450,6 @@ bool BridgedType::isBuiltinVector() const {
   return unbridged().isBuiltinVector();
 }
 
-bool BridgedType::isLegalFormalType() const {
-  return unbridged().getASTType()->isLegalFormalType();
-}
-
 BridgedType BridgedType::getBuiltinVectorElementType() const {
   return unbridged().getBuiltinVectorElementType();
 }