Mark array constructors with 'inline'

To allow non-local returns from lambdas passed to them

compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineUtil.java

@@ -111,22 +111,22 @@ public class InlineUtil {
         if (!canBeInlineArgument(argument)) return null;
 
         KtExpression call = KtPsiUtil.getParentCallIfPresent(argument);
-        if (call != null) {
-            ResolvedCall<?> resolvedCall = CallUtilKt.getResolvedCall(call, bindingContext);
-            if (resolvedCall != null && isInline(resolvedCall.getResultingDescriptor())) {
-                ValueArgument valueArgument = CallUtilKt.getValueArgumentForExpression(resolvedCall.getCall(), argument);
-                if (valueArgument != null) {
-                    ArgumentMapping mapping = resolvedCall.getArgumentMapping(valueArgument);
-                    if (mapping instanceof ArgumentMatch) {
-                        ValueParameterDescriptor parameter = ((ArgumentMatch) mapping).getValueParameter();
-                        if (isInlineLambdaParameter(parameter)) {
-                            return parameter;
-                        }
-                    }
-                }
-            }
-        }
-        return null;
+        if (call == null) return null;
+
+        ResolvedCall<?> resolvedCall = CallUtilKt.getResolvedCall(call, bindingContext);
+        if (resolvedCall == null) return null;
+
+        CallableDescriptor descriptor = resolvedCall.getResultingDescriptor();
+        if (!isInline(descriptor) && !isArrayConstructorWithLambda(descriptor)) return null;
+
+        ValueArgument valueArgument = CallUtilKt.getValueArgumentForExpression(resolvedCall.getCall(), argument);
+        if (valueArgument == null) return null;
+
+        ArgumentMapping mapping = resolvedCall.getArgumentMapping(valueArgument);
+        if (!(mapping instanceof ArgumentMatch)) return null;
+
+        ValueParameterDescriptor parameter = ((ArgumentMatch) mapping).getValueParameter();
+        return isInlineLambdaParameter(parameter) ? parameter : null;
     }
 
     public static boolean canBeInlineArgument(@Nullable PsiElement functionalExpression) {

compiler/testData/builtin-classes-kotlin.txt

@@ -22,7 +22,7 @@ public open class Any {
 }
 
 public final class Array</*0*/ T> : kotlin.Cloneable {
-    /*primary*/ public constructor Array</*0*/ T>(/*0*/ size: kotlin.Int, /*1*/ init: (kotlin.Int) -> T)
+    public constructor Array</*0*/ T>(/*0*/ size: kotlin.Int, /*1*/ init: (kotlin.Int) -> T)
     public final val size: kotlin.Int
         public final fun <get-size>(): kotlin.Int
     public open override /*1*/ fun clone(): kotlin.Array<T>

compiler/testData/codegen/boxWithStdlib/arrays/nonLocalReturnArrayConstructor.kt

@@ -0,0 +1,21 @@
+fun testArray() {
+    Array<String>(5) { i ->
+        if (i == 3) return
+        i.toString()
+    }
+    throw AssertionError()
+}
+
+fun testIntArray() {
+    IntArray(5) { i ->
+        if (i == 3) return
+        i
+    }
+    throw AssertionError()
+}
+
+fun box(): String {
+    testArray()
+    testIntArray()
+    return "OK"
+}

compiler/testData/codegen/boxWithStdlib/reified/arraysReification/jaggedArray.kt

@@ -1,4 +1,4 @@
-inline fun <reified T> jaggedArray(crossinline x: (Int, Int) -> T): Array<Array<T>> = Array(1) { i ->
+inline fun <reified T> jaggedArray(x: (Int, Int) -> T): Array<Array<T>> = Array(1) { i ->
     Array(1) { j -> x(i, j) }
 }
 

compiler/testData/codegen/boxWithStdlib/reified/arraysReification/jaggedDeep.kt

@@ -1,4 +1,4 @@
-inline fun <reified T> jaggedArray(crossinline x: (Int, Int, Int) -> T): Array<Array<Array<T>>> = Array(1) { i ->
+inline fun <reified T> jaggedArray(x: (Int, Int, Int) -> T): Array<Array<Array<T>>> = Array(1) { i ->
     Array(1) {
         j -> Array(1) { k -> x(i, j, k)  }
     }

compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java

@@ -286,6 +286,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             doTestWithStdlib(fileName);
         }
 
+        @TestMetadata("nonLocalReturnArrayConstructor.kt")
+        public void testNonLocalReturnArrayConstructor() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/nonLocalReturnArrayConstructor.kt");
+            doTestWithStdlib(fileName);
+        }
+
         @TestMetadata("nonNullArray.kt")
         public void testNonNullArray() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/nonNullArray.kt");

core/builtins/native/kotlin/Array.kt

@@ -22,10 +22,14 @@ package kotlin
  * standard library functions.
  * See [Kotlin language documentation](http://kotlinlang.org/docs/reference/basic-types.html#arrays)
  * for more information on arrays.
- * @constructor Creates a new array with the specified [size], where each element is calculated by calling the specified
- * [init] function. The [init] function returns an array element given its index.
  */
-public class Array<T>(size: Int, init: (Int) -> T): Cloneable {
+public class Array<T> : Cloneable {
+    /**
+     * Creates a new array with the specified [size], where each element is calculated by calling the specified
+     * [init] function. The [init] function returns an array element given its index.
+     */
+    public inline constructor(size: Int, init: (Int) -> T)
+
     /**
      * Returns the array element at the specified [index]. This method can be called using the
      * index operator:

core/builtins/native/kotlin/Arrays.kt

@@ -27,7 +27,7 @@ public class ByteArray(size: Int) : Cloneable {
      * Creates a new array of the specified [size], where each element is calculated by calling the specified
      * [init] function. The [init] function returns an array element given its index.
      */
-    public constructor(size: Int, init: (Int) -> Byte)
+    public inline constructor(size: Int, init: (Int) -> Byte)
 
     /** Returns the array element at the given [index]. This method can be called using the index operator. */
     public operator fun get(index: Int): Byte
@@ -52,7 +52,7 @@ public class CharArray(size: Int) : Cloneable {
      * Creates a new array of the specified [size], where each element is calculated by calling the specified
      * [init] function. The [init] function returns an array element given its index.
      */
-    public constructor(size: Int, init: (Int) -> Char)
+    public inline constructor(size: Int, init: (Int) -> Char)
 
     /** Returns the array element at the given [index]. This method can be called using the index operator. */
     public operator fun get(index: Int): Char
@@ -77,7 +77,7 @@ public class ShortArray(size: Int) : Cloneable {
      * Creates a new array of the specified [size], where each element is calculated by calling the specified
      * [init] function. The [init] function returns an array element given its index.
      */
-    public constructor(size: Int, init: (Int) -> Short)
+    public inline constructor(size: Int, init: (Int) -> Short)
 
     /** Returns the array element at the given [index]. This method can be called using the index operator. */
     public operator fun get(index: Int): Short
@@ -102,7 +102,7 @@ public class IntArray(size: Int) : Cloneable {
      * Creates a new array of the specified [size], where each element is calculated by calling the specified
      * [init] function. The [init] function returns an array element given its index.
      */
-    public constructor(size: Int, init: (Int) -> Int)
+    public inline constructor(size: Int, init: (Int) -> Int)
 
     /** Returns the array element at the given [index]. This method can be called using the index operator. */
     public operator fun get(index: Int): Int
@@ -127,7 +127,7 @@ public class LongArray(size: Int) : Cloneable {
      * Creates a new array of the specified [size], where each element is calculated by calling the specified
      * [init] function. The [init] function returns an array element given its index.
      */
-    public constructor(size: Int, init: (Int) -> Long)
+    public inline constructor(size: Int, init: (Int) -> Long)
 
     /** Returns the array element at the given [index]. This method can be called using the index operator. */
     public operator fun get(index: Int): Long
@@ -152,7 +152,7 @@ public class FloatArray(size: Int) : Cloneable {
      * Creates a new array of the specified [size], where each element is calculated by calling the specified
      * [init] function. The [init] function returns an array element given its index.
      */
-    public constructor(size: Int, init: (Int) -> Float)
+    public inline constructor(size: Int, init: (Int) -> Float)
 
     /** Returns the array element at the given [index]. This method can be called using the index operator. */
     public operator fun get(index: Int): Float
@@ -177,7 +177,7 @@ public class DoubleArray(size: Int) : Cloneable {
      * Creates a new array of the specified [size], where each element is calculated by calling the specified
      * [init] function. The [init] function returns an array element given its index.
      */
-    public constructor(size: Int, init: (Int) -> Double)
+    public inline constructor(size: Int, init: (Int) -> Double)
 
     /** Returns the array element at the given [index]. This method can be called using the index operator. */
     public operator fun get(index: Int): Double
@@ -202,7 +202,7 @@ public class BooleanArray(size: Int) : Cloneable {
      * Creates a new array of the specified [size], where each element is calculated by calling the specified
      * [init] function. The [init] function returns an array element given its index.
      */
-    public constructor(size: Int, init: (Int) -> Boolean)
+    public inline constructor(size: Int, init: (Int) -> Boolean)
 
     /** Returns the array element at the given [index]. This method can be called using the index operator. */
     public operator fun get(index: Int): Boolean

generators/src/org/jetbrains/kotlin/generators/builtins/arrays.kt

@@ -37,7 +37,7 @@ class GenerateArrays(out: PrintWriter) : BuiltInsSourceGenerator(out) {
             out.println("     * Creates a new array of the specified [size], where each element is calculated by calling the specified")
             out.println("     * [init] function. The [init] function returns an array element given its index.")
             out.println("     */")
-            out.println("    public constructor(size: Int, init: (Int) -> $s)")
+            out.println("    public inline constructor(size: Int, init: (Int) -> $s)")
             out.println()
             out.println("    /** Returns the array element at the given [index]. This method can be called using the index operator. */")
             out.println("    public operator fun get(index: Int): $s")