[SILOptimizer] Refines the implementation of of the bridged SILType for Swift.

Author: WeZZard

SwiftCompilerSources/Sources/AST/Type.swift

@@ -93,6 +93,7 @@ extension TypeProperties {
   public var isEscapable: Bool { type.bridged.isEscapable() }
   public var isNoEscape: Bool { type.bridged.isNoEscape() }
   public var isInteger: Bool { type.bridged.isInteger() }
+  public var isOptional: Bool { type.bridged.isOptional() }
   public var isMetatypeType: Bool { type.bridged.isMetatypeType() }
   public var isExistentialMetatypeType: Bool { type.bridged.isExistentialMetatypeType() }
   public var representationOfMetatype: AST.`Type`.MetatypeRepresentation {

SwiftCompilerSources/Sources/SIL/Type.swift

@@ -63,7 +63,7 @@ public struct Type : CustomStringConvertible, NoReflectionChildren {
   public var isFunction: Bool { bridged.isFunction() }
   public var isMetatype: Bool { bridged.isMetatype() }
   public var isClassExistential: Bool { bridged.isClassExistential() }
-  public var isOptional: Bool { bridged.isOptional() }
+  public var isOptional: Bool { astType.isOptional }
   public var isNoEscapeFunction: Bool { bridged.isNoEscapeFunction() }
   public var containsNoEscapeFunction: Bool { bridged.containsNoEscapeFunction() }
   public var isThickFunction: Bool { bridged.isThickFunction() }

include/swift/AST/ASTBridging.h

@@ -3021,6 +3021,7 @@ struct BridgedASTType {
   BRIDGED_INLINE bool isInteger() const;
   BRIDGED_INLINE bool isMetatypeType() const;
   BRIDGED_INLINE bool isExistentialMetatypeType() const;
+  BRIDGED_INLINE bool isOptional() const;
   BRIDGED_INLINE TraitResult canBeClass() const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE OptionalBridgedDeclObj getAnyNominal() const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedASTType getInstanceTypeOfMetatype() const;

include/swift/AST/ASTBridgingImpl.h

@@ -430,6 +430,10 @@ bool BridgedASTType::isMetatypeType() const {
   return unbridged()->is<swift::AnyMetatypeType>();
 }
 
+bool BridgedASTType::isOptional() const {
+  return unbridged()->getCanonicalType()->isOptional();
+}
+
 bool BridgedASTType::isExistentialMetatypeType() const {
   return unbridged()->is<swift::ExistentialMetatypeType>();
 }

include/swift/AST/Types.h

@@ -795,9 +795,6 @@ class alignas(1 << TypeAlignInBits) TypeBase
   /// Determine whether the type is an opened existential type with Error inside
   bool isOpenedExistentialWithError();
 
-  /// Determine whether the type is an Optional type.
-  bool isOptional() const;
-
   /// Retrieve the set of type parameter packs that occur within this type.
   void getTypeParameterPacks(SmallVectorImpl<Type> &rootParameterPacks);
 
@@ -7929,10 +7926,6 @@ inline bool TypeBase::isClassExistentialType() {
   return false;
 }
 
-inline bool TypeBase::isOptional() const {
-  return getCanonicalType()->isOptional();
-}
-
 inline bool TypeBase::canDynamicallyBeOptionalType(bool includeExistential) {
   CanType T = getCanonicalType();
   auto isArchetypeOrExistential = isa<ArchetypeType>(T) ||

include/swift/SIL/SILBridgingImpl.h

@@ -403,7 +403,8 @@ bool BridgedType::isClassExistential() const {
 }
 
 bool BridgedType::isOptional() const {
-  return unbridged().isOptional();
+  swift::CanType astType = unbridged().getASTType();
+  return astType->isOptional();
 }
 
 bool BridgedType::isNoEscapeFunction() const {

include/swift/SIL/SILType.h

@@ -458,11 +458,6 @@ class SILType {
     return getASTType()->hasOpenedExistential();
   }
 
-  /// Returns true if the referenced type is an Optional type.
-  bool isOptional() const {
-    return getASTType()->isOptional();
-  }
-
   TypeTraitResult canBeClass() const {
     return getASTType()->canBeClass();
   }