(fixup later) clean up code

Author: elsakeirouz

SwiftCompilerSources/Sources/AST/Type.swift

@@ -274,8 +274,8 @@ extension TypeProperties {
     return rawType.bridged.isSILPackElementAddress()
   }
 
-  public func getPackElementType(_ index: Int) -> Type {
-    return Type(bridged: rawType.bridged.getPackElementType(index));
+  public var packElementTypes: TypeArray {
+    return TypeArray(bridged: rawType.bridged.getPackElementTypes())
   }
 }
 

SwiftCompilerSources/Sources/Optimizer/InstructionSimplification/SimplifyAllocStack.swift

@@ -18,7 +18,9 @@ extension AllocStackInst : Simplifiable, SILCombineSimplifiable {
     if optimizeEnum(context) {
       return
     }
-    _ = optimizeExistential(context)
+    if optimizeExistential(context) {
+      return
+    }
     _ = optimizePackElement(context)
   }
 }
@@ -308,8 +310,10 @@ private extension AllocStackInst {
   ///
   /// For example:
   /// ```
-  ///   %0 = alloc_stack $@pack_element(...) ...
-  ///   use %1
+  ///  %1 = dynamic_pack_index %0 of $Pack{T, U}
+  ///  %2 = open_pack_element %1 of <...> at <Pack{T, U}> ...
+  ///  %3 = alloc_stack $@pack_element(...) ...
+  ///  use %3
   /// ```
   /// is transformed to
   /// ```

SwiftCompilerSources/Sources/Optimizer/InstructionSimplification/SimplifyUncheckedAddrCast.swift

@@ -44,17 +44,21 @@ extension UncheckedAddrCastInst : OnoneSimplifiable, SILCombineSimplifiable {
     // ```
     //   %1 = vector_base_addr %0 : $*Builtin.FixedArray<N, Element>
     // ```
-    _ = optimizeVectorBaseCast(context)
+    if optimizeVectorBaseCast(context) {
+      return
+    }
 
     // ```
-    //   %1 = unchecked_addr_cast %0 to $*pack_element("...") ...
+    //   %2 = dynamic_pack_index %1 of $Pack{T, U}
+    //   %3 = open_pack_element %2 of <...> at <Pack{T, U}> ...
+    //   %4 = pack_element_get %3 of %11 as $*Int
+    //   %5 = unchecked_addr_cast %4 to $*@pack_element(..)
     // ```
     // ->
     // ```
     //   %1 = unchecked_addr_cast %0 to $T
     // ```
     _ = optimizePackElement(context)
-
   }
 }
 
@@ -96,7 +100,7 @@ private extension UncheckedAddrCastInst {
 
     let builder = Builder(before: self, context)
     let newCast = builder.createUncheckedAddrCast(from: fromAddress,
-    to:concreteType.loweredType(in: parentFunction).addressType)
+      to: concreteType.loweredType(in: parentFunction).addressType)
     self.replace(with: newCast, context)
     return true
   }

SwiftCompilerSources/Sources/Optimizer/InstructionSimplification/SimplifyWitnessMethod.swift

@@ -15,7 +15,9 @@ import SIL
 
 extension WitnessMethodInst : Simplifiable, SILCombineSimplifiable {
   func simplify(_ context: SimplifyContext) {
-    _ = tryReplaceExistentialArchetype(of: self, context)
+    if tryReplaceExistentialArchetype(of: self, context) {
+      return
+    }
     _ = tryReplacePackElementArchetype(of: self, context)
   }
 }

SwiftCompilerSources/Sources/Optimizer/Utilities/OptUtils.swift

@@ -560,7 +560,7 @@ extension Instruction {
        let ili = dpi.operands.first?.value as? IntegerLiteralInst,
        let index = ili.value
     {
-      return dpi.indexedPackType.getPackElementType(index).canonical
+      return dpi.indexedPackType.packElementTypes[index].canonical
     }
     return nil
   }

include/swift/AST/ASTBridging.h

@@ -2915,6 +2915,15 @@ enum ENUM_EXTENSIBILITY_ATTR(open) BridgedMacroDefinitionKind : size_t {
   BridgedBuiltinIsolationMacro,
 };
 
+struct BridgedASTTypeArray {
+  BridgedArrayRef typeArray;
+
+  SwiftInt getCount() const { return SwiftInt(typeArray.Length); }
+
+  SWIFT_IMPORT_UNSAFE BRIDGED_INLINE
+  BridgedASTType getAt(SwiftInt index) const;
+};
+
 struct BridgedASTType {
   enum class TraitResult {
     IsNot,
@@ -2994,7 +3003,7 @@ struct BridgedASTType {
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedConformance checkConformance(BridgedDeclObj proto) const;
   BRIDGED_INLINE bool containsSILPackExpansionType() const;
   BRIDGED_INLINE bool isSILPackElementAddress() const;
-  SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedASTType getPackElementType(SwiftInt index) const;
+  BRIDGED_INLINE BridgedASTTypeArray getPackElementTypes() const;
 };
 
 class BridgedCanType {
@@ -3007,15 +3016,6 @@ class BridgedCanType {
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedASTType getRawType() const;
 };
 
-struct BridgedASTTypeArray {
-  BridgedArrayRef typeArray;
-
-  SwiftInt getCount() const { return SwiftInt(typeArray.Length); }
-
-  SWIFT_IMPORT_UNSAFE BRIDGED_INLINE
-  BridgedASTType getAt(SwiftInt index) const;
-};
-
 struct BridgedConformance {
   void * _Nullable opaqueValue;
 

include/swift/AST/ASTBridgingImpl.h

@@ -656,9 +656,8 @@ bool BridgedASTType::isSILPackElementAddress() const {
   return unbridged()->castTo<swift::SILPackType>()->isElementAddress();
 }
 
-BridgedASTType BridgedASTType::getPackElementType(SwiftInt index) const {
-    ASSERT(index >= 0);
-    return {unbridged()->castTo<swift::PackType>()->getElementType(index).getPointer()};
+BRIDGED_INLINE BridgedASTTypeArray BridgedASTType::getPackElementTypes() const {
+    return {unbridged()->castTo<swift::PackType>()->getElementTypes()};
 }
 
 static_assert((int)BridgedASTType::TraitResult::IsNot == (int)swift::TypeTraitResult::IsNot);