Implement toTypedArray as non-intrinsic.
Remove unused intrinsic method.
This commit is contained in:
@@ -1,39 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2010-2015 JetBrains s.r.o.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.jetbrains.kotlin.codegen.intrinsics
|
|
||||||
|
|
||||||
import org.jetbrains.kotlin.codegen.Callable
|
|
||||||
import org.jetbrains.kotlin.codegen.ExpressionCodegen
|
|
||||||
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
|
|
||||||
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
|
|
||||||
import org.jetbrains.kotlin.resolve.jvm.AsmTypes.getType
|
|
||||||
import org.jetbrains.org.objectweb.asm.Type
|
|
||||||
import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
|
|
||||||
|
|
||||||
public class CopyToArray : IntrinsicMethod() {
|
|
||||||
|
|
||||||
override fun toCallable(fd: FunctionDescriptor, isSuper: Boolean, resolvedCall: ResolvedCall<*>, codegen: ExpressionCodegen): Callable {
|
|
||||||
return object : IntrinsicCallable(getType(javaClass<Array<Any>>()), listOf(), null, Type.getType(javaClass<Collection<*>>())) {
|
|
||||||
override fun invokeIntrinsic(v: InstructionAdapter) {
|
|
||||||
v.dup()
|
|
||||||
v.invokeinterface("java/util/Collection", "size", "()I")
|
|
||||||
codegen.newArrayInstruction(resolvedCall.getResultingDescriptor().getReturnType()!!)
|
|
||||||
v.invokeinterface("java/util/Collection", "toArray", "([Ljava/lang/Object;)[Ljava/lang/Object;")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -68,7 +68,6 @@ public class IntrinsicMethods {
|
|||||||
namedMethods.put("kotlin.javaClass.function", new JavaClassFunction());
|
namedMethods.put("kotlin.javaClass.function", new JavaClassFunction());
|
||||||
namedMethods.put("kotlin.javaClass.property", new JavaClassProperty());
|
namedMethods.put("kotlin.javaClass.property", new JavaClassProperty());
|
||||||
namedMethods.put("kotlin.arrays.array", new JavaClassArray());
|
namedMethods.put("kotlin.arrays.array", new JavaClassArray());
|
||||||
namedMethods.put("kotlin.collections.copyToArray", new CopyToArray());
|
|
||||||
namedMethods.put("kotlin.jvm.internal.unsafe.monitorEnter", MonitorInstruction.MONITOR_ENTER);
|
namedMethods.put("kotlin.jvm.internal.unsafe.monitorEnter", MonitorInstruction.MONITOR_ENTER);
|
||||||
namedMethods.put("kotlin.jvm.internal.unsafe.monitorExit", MonitorInstruction.MONITOR_EXIT);
|
namedMethods.put("kotlin.jvm.internal.unsafe.monitorExit", MonitorInstruction.MONITOR_EXIT);
|
||||||
|
|
||||||
|
|||||||
@@ -82,8 +82,10 @@ public fun ByteArray.toString(charset: Charset): String = String(this, charset)
|
|||||||
* Allocates an array of runtime type `T` having its size equal to the size of this collection
|
* Allocates an array of runtime type `T` having its size equal to the size of this collection
|
||||||
* and populates the array with the elements of this collection.
|
* and populates the array with the elements of this collection.
|
||||||
*/
|
*/
|
||||||
[Intrinsic("kotlin.collections.copyToArray")] public fun <reified T> Collection<T>.toTypedArray(): Array<T> =
|
public inline fun <reified T> Collection<T>.toTypedArray(): Array<T> {
|
||||||
throw UnsupportedOperationException()
|
val thisCollection = this as java.util.Collection<T>
|
||||||
|
return thisCollection.toArray(arrayOfNulls<T>(thisCollection.size())) as Array<T>
|
||||||
|
}
|
||||||
|
|
||||||
/** Returns the array if it's not null, or an empty array otherwise. */
|
/** Returns the array if it's not null, or an empty array otherwise. */
|
||||||
public inline fun <reified T> Array<out T>?.orEmpty(): Array<out T> = this ?: arrayOf<T>()
|
public inline fun <reified T> Array<out T>?.orEmpty(): Array<out T> = this ?: arrayOf<T>()
|
||||||
|
|||||||
Reference in New Issue
Block a user