SIL: replace CanonicalType.objectType and CanonicalType.addressType with silType

`SIL.Type` itself has `objectType` and `addressType` to convert between both variants.

Author: eeckstein

SwiftCompilerSources/Sources/SIL/ASTExtensions.swift

@@ -14,8 +14,11 @@ import AST
 import SILBridging
 
 extension CanonicalType {
-  var objectType: Type { BridgedType.createObjectType(bridged).type }
-  var addressType: Type { BridgedType.createAddressType(bridged).type }
+  // This can yield nil if the AST type is not a lowered type.
+  // For example, if the AST type is a `AnyFunctionType` for which the lowered type would be a `SILFunctionType`.
+  public var silType: Type? {
+    BridgedType.createSILType(bridged).typeOrNil
+  }
 }
 
 extension Decl {
@@ -30,7 +33,7 @@ extension NominalTypeDecl {
 
 extension ClassDecl {
   public var superClassType: Type? {
-    self.superClass?.canonical.objectType
+    self.superClass?.canonical.silType!
   }
 }
 

include/swift/SIL/SILBridging.h

@@ -245,8 +245,7 @@ struct BridgedType {
   BRIDGED_INLINE swift::SILType unbridged() const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedCanType getCanType() const;
 
-  static SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedType createObjectType(BridgedCanType canTy);
-  static SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedType createAddressType(BridgedCanType canTy);
+  static SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedType createSILType(BridgedCanType canTy);
   BRIDGED_INLINE BridgedOwnedString getDebugDescription() const;
   BRIDGED_INLINE bool isNull() const;
   BRIDGED_INLINE bool isAddress() const;

include/swift/SIL/SILBridgingImpl.h

@@ -284,12 +284,11 @@ BridgedType::EnumElementIterator BridgedType::EnumElementIterator::getNext() con
   return bridge(std::next(unbridge(*this)));
 }
 
-BridgedType BridgedType::createObjectType(BridgedCanType canTy) {
-  return swift::SILType::getPrimitiveObjectType(canTy.unbridged());
-}
-
-BridgedType BridgedType::createAddressType(BridgedCanType canTy) {
-  return swift::SILType::getPrimitiveAddressType(canTy.unbridged());
+BridgedType BridgedType::createSILType(BridgedCanType canTy) {
+  auto ty = canTy.unbridged();
+  if (ty->isLegalSILType())
+    return swift::SILType::getPrimitiveObjectType(ty);
+  return swift::SILType();
 }
 
 BridgedOwnedString BridgedType::getDebugDescription() const {