Make _InlineArray subject to the same optimizations as InlineArray

Author: tbkka

include/swift/AST/KnownStdlibTypes.def

@@ -101,6 +101,7 @@ KNOWN_STDLIB_TYPE_DECL(DecodingError, NominalTypeDecl, 0)
 KNOWN_STDLIB_TYPE_DECL(Result, NominalTypeDecl, 2)
 
 KNOWN_STDLIB_TYPE_DECL(InlineArray, NominalTypeDecl, 2)
+KNOWN_STDLIB_TYPE_DECL(_InlineArray, NominalTypeDecl, 2)
 
 KNOWN_STDLIB_TYPE_DECL(MutableSpan, NominalTypeDecl, 1)
 

lib/AST/Type.cpp

@@ -853,7 +853,7 @@ Type TypeBase::getArrayElementType() {
 }
 
 Type TypeBase::getInlineArrayElementType() {
-  if (!isInlineArray())
+  if (!isInlineArray() && !is_InlineArray())
     return Type();
 
   if (!is<BoundGenericStructType>())

lib/IRGen/IRGenDebugInfo.cpp

@@ -1358,7 +1358,8 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
     // these can be reconstructed by substituting the "template parameters" in
     // the unspecialized type. We make an exception for inline arrays, because
     // DWARF has special support for arrays.
-    if (Type->isInlineArray() && !Type->hasTypeParameter() &&
+    if ((Type->isInlineArray() || Type->is_InlineArray()) &&
+	!Type->hasTypeParameter() &&
         !Type->hasPrimaryArchetype())
       // Create the substituted type.
       return createStructType(Type, Decl, Scope, File, Line, SizeInBits,

lib/SILGen/SILGenExpr.cpp

@@ -5178,7 +5178,7 @@ static RValue emitInlineArrayLiteral(SILGenFunction &SGF, CollectionExpr *E,
 
 RValue RValueEmitter::visitCollectionExpr(CollectionExpr *E, SGFContext C) {
   // Handle 'InlineArray' literals separately.
-  if (E->getType()->isInlineArray()) {
+  if (E->getType()->isInlineArray() || E->getType()->is_InlineArray()) {
     return emitInlineArrayLiteral(SGF, E, C);
   }
 

lib/Sema/CSApply.cpp

@@ -3976,7 +3976,7 @@ namespace {
       Type arrayTy = cs.getType(expr);
       Type elementType;
 
-      if (arrayTy->isInlineArray()) {
+      if (arrayTy->isInlineArray() || arrayTy->is_InlineArray()) {
         // <let count: Int, Element>
         elementType = arrayTy->castTo<BoundGenericStructType>()->getGenericArgs()[1];
       } else {

lib/Sema/CSGen.cpp

@@ -2208,7 +2208,7 @@ namespace {
         if (contextualType->isArray())
           eltType = contextualType->getArrayElementType();
 
-        if (contextualType->isInlineArray())
+        if (contextualType->isInlineArray() || contextualType->is_InlineArray())
           eltType = contextualType->getInlineArrayElementType();
 
         CS.addConstraint(ConstraintKind::LiteralConformsTo, contextualType,

lib/Sema/CSSimplify.cpp

@@ -8986,7 +8986,7 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(
     // parameter, then check if the counts are equal and solve.
     if (kind == ConstraintKind::LiteralConformsTo &&
         protocol == arrayLiteralProto &&
-        type->isInlineArray() &&
+        (type->isInlineArray() || type->is_InlineArray()) &&
         arrayLiteral) {
       auto iaTy = type->castTo<BoundGenericStructType>();
 

lib/Sema/ConstraintSystem.cpp

@@ -1792,7 +1792,7 @@ struct TypeSimplifier {
           // Special case: When building slab literals, we go through the same
           // array literal machinery, so there will be a conversion constraint
           // for the element to ExpressibleByArrayLiteral.ArrayLiteralType.
-          if (lookupBaseType->isInlineArray()) {
+          if (lookupBaseType->isInlineArray() || lookupBaseType->is_InlineArray()) {
             auto &ctx = CS.getASTContext();
             auto arrayProto =
                 ctx.getProtocol(KnownProtocolKind::ExpressibleByArrayLiteral);