SIL: add some Type APIs and make Type a DiagnosticArgument

Author: eeckstein

SwiftCompilerSources/Sources/Optimizer/Utilities/DiagnosticEngine.swift

@@ -30,6 +30,11 @@ extension Int: DiagnosticArgument {
     fn(BridgedDiagnosticArgument(self))
   }
 }
+extension Type: DiagnosticArgument {
+  public func _withBridgedDiagnosticArgument(_ fn: (BridgedDiagnosticArgument) -> Void) {
+    fn(bridged.asDiagnosticArgument())
+  }
+}
 extension DeclRef: DiagnosticArgument {
   public func _withBridgedDiagnosticArgument(_ fn: (BridgedDiagnosticArgument) -> Void) {
     fn(bridged.asDiagnosticArgument())

SwiftCompilerSources/Sources/SIL/Type.swift

@@ -80,6 +80,17 @@ public struct Type : CustomStringConvertible, NoReflectionChildren {
     NominalTypeDecl(_bridged: bridged.getNominalOrBoundGenericNominal())
   }
 
+  public var superClassType: Type? {
+    precondition(isClass)
+    return bridged.getSuperClassType().typeOrNil
+  }
+
+  public var contextSubstitutionMap: SubstitutionMap {
+    SubstitutionMap(bridged: bridged.getContextSubstitutionMap())
+  }
+
+  public var isGenericAtAnyLevel: Bool { bridged.isGenericAtAnyLevel() }
+
   public var isOrContainsObjectiveCClass: Bool { bridged.isOrContainsObjectiveCClass() }
 
   public var isBuiltinInteger: Bool { bridged.isBuiltinInteger() }

include/swift/SIL/SILBridging.h

@@ -42,6 +42,8 @@ struct BridgedFunction;
 struct BridgedBasicBlock;
 struct BridgedSuccessorArray;
 struct OptionalBridgedBasicBlock;
+struct BridgedSubstitutionMap;
+struct BridgedProtocolConformance;
 
 namespace swift {
 class ValueBase;
@@ -286,6 +288,7 @@ struct BridgedType {
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedType getAddressType() const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedType getObjectType() const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedASTType getASTType() const;
+  SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedDiagnosticArgument asDiagnosticArgument() const;
   BRIDGED_INLINE bool isTrivial(BridgedFunction f) const;
   BRIDGED_INLINE bool isNonTrivialOrContainsRawPointer(BridgedFunction f) const;
   BRIDGED_INLINE bool isValueTypeWithDeinit() const;
@@ -295,6 +298,8 @@ struct BridgedType {
   BRIDGED_INLINE bool hasArchetype() const;
   BRIDGED_INLINE bool isNominalOrBoundGenericNominal() const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedNominalTypeDecl getNominalOrBoundGenericNominal() const;
+  SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedSubstitutionMap getContextSubstitutionMap() const;
+  BRIDGED_INLINE bool isGenericAtAnyLevel() const;
   BRIDGED_INLINE bool isClassOrBoundGenericClass() const;
   BRIDGED_INLINE bool isStructOrBoundGenericStruct() const;
   BRIDGED_INLINE bool isTuple() const;
@@ -336,6 +341,7 @@ struct BridgedType {
   getTupleElementType(SwiftInt idx) const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedType getFunctionTypeWithNoEscape(bool withNoEscape) const;
   BRIDGED_INLINE BridgedArgumentConvention getCalleeConvention() const;
+  SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedType getSuperClassType() const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE
   static BridgedType getSuperClassTypeOfClassDecl(BridgedNominalTypeDecl decl);
 };

include/swift/SIL/SILBridgingImpl.h

@@ -323,6 +323,10 @@ BridgedASTType BridgedType::getASTType() const {
   return {unbridged().getASTType().getPointer()};
 }
 
+BridgedDiagnosticArgument BridgedType::asDiagnosticArgument() const {
+  return swift::DiagnosticArgument(unbridged().getASTType());
+}
+
 bool BridgedType::isTrivial(BridgedFunction f) const {
   return unbridged().isTrivial(f.getFunction());
 }
@@ -355,6 +359,16 @@ bool BridgedType::isNominalOrBoundGenericNominal() const {
   return unbridged().getNominalOrBoundGenericNominal() != nullptr;
 }
 
+BridgedSubstitutionMap BridgedType::getContextSubstitutionMap() const {
+  swift::CanType astType = unbridged().getASTType();
+  return astType->getContextSubstitutionMap();
+}
+
+bool BridgedType::isGenericAtAnyLevel() const {
+  swift::CanType astType = unbridged().getASTType();
+  return astType->isSpecialized();
+}
+
 BridgedNominalTypeDecl BridgedType::getNominalOrBoundGenericNominal() const {
   return {unbridged().getNominalOrBoundGenericNominal()};
 }
@@ -531,6 +545,10 @@ BridgedArgumentConvention BridgedType::getCalleeConvention() const {
   return getArgumentConvention(fnType->getCalleeConvention());
 }
 
+BridgedType BridgedType::getSuperClassType() const {
+  return unbridged().getSuperclass();
+}
+
 BridgedType BridgedType::getSuperClassTypeOfClassDecl(BridgedNominalTypeDecl decl) {
   swift::Type superTy = swift::cast<swift::ClassDecl>(decl.unbridged())->getSuperclass();
   if (!superTy) {