From 43dcbbcce12f6bf6af13979b34a681f96ce056fc Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 23 Aug 2018 14:42:26 +0200
Subject: [PATCH] Minor, use arrayOf to simplify code in FunctionCaller

---
 .../reflect/jvm/internal/FunctionCaller.kt    | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/FunctionCaller.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/FunctionCaller.kt
index 9afe8230cea..623ba944ec5 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/FunctionCaller.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/FunctionCaller.kt
@@ -75,7 +75,7 @@ internal abstract class FunctionCaller<out M : Member?>(
         ) {
         override fun call(args: Array<*>): Any? {
             checkArguments(args)
-            return member.newInstance(*argsWithReceiver(boundReceiver, args))
+            return member.newInstance(boundReceiver, *args)
         }
     }
 
@@ -111,7 +111,7 @@ internal abstract class FunctionCaller<out M : Member?>(
     class InstanceMethod(method: ReflectMethod) : Method(method) {
         override fun call(args: Array<*>): Any? {
             checkArguments(args)
-            return callMethod(args[0], args.dropFirstArg())
+            return callMethod(args[0], args.dropFirst())
         }
     }
 
@@ -119,7 +119,7 @@ internal abstract class FunctionCaller<out M : Member?>(
         override fun call(args: Array<*>): Any? {
             checkArguments(args)
             checkObjectInstance(args.firstOrNull())
-            return callMethod(null, args.dropFirstArg())
+            return callMethod(null, args.dropFirst())
         }
     }
 
@@ -128,7 +128,7 @@ internal abstract class FunctionCaller<out M : Member?>(
     ) {
         override fun call(args: Array<*>): Any? {
             checkArguments(args)
-            return callMethod(null, argsWithReceiver(boundReceiver, args))
+            return callMethod(null, arrayOf(boundReceiver, *args))
         }
     }
 
@@ -280,19 +280,8 @@ internal abstract class FunctionCaller<out M : Member?>(
     }
 
     companion object {
-        // TODO lazily allocate array at bound callers?
-        fun argsWithReceiver(receiver: Any?, args: Array<out Any?>): Array<out Any?> =
-            arrayOfNulls<Any?>(args.size + 1).apply {
-                this[0] = receiver
-                System.arraycopy(args, 0, this, 1, args.size)
-            }
-
         @Suppress("UNCHECKED_CAST")
         inline fun <reified T> Array<out T>.dropFirst(): Array<T> =
             if (size <= 1) emptyArray() else copyOfRange(1, size) as Array<T>
-
-        @Suppress("UNCHECKED_CAST")
-        fun Array<*>.dropFirstArg(): Array<Any?> =
-            (this as Array<Any?>).dropFirst()
     }
 }