Implement callSuspend and callSuspendBy functions as KCallable's
extension methods. Also make isSuspend a member of KCallable. #KT-21972: Fixed
This commit is contained in:
committed by
Ilya Gorbunov
parent
66315cee45
commit
e93683621a
@@ -0,0 +1,65 @@
|
|||||||
|
// !LANGUAGE: +ReleaseCoroutines
|
||||||
|
// WITH_COROUTINES
|
||||||
|
// WITH_REFLECT
|
||||||
|
|
||||||
|
import helpers.*
|
||||||
|
import kotlin.coroutines.*
|
||||||
|
import kotlin.coroutines.intrinsics.*
|
||||||
|
import kotlin.reflect.full.callSuspend
|
||||||
|
|
||||||
|
fun builder(c: suspend () -> Unit) {
|
||||||
|
c.startCoroutine(EmptyContinuation)
|
||||||
|
}
|
||||||
|
|
||||||
|
class A {
|
||||||
|
suspend fun noArgs() = "OK"
|
||||||
|
|
||||||
|
suspend fun twoArgs(a: String, b: String) = "$a$b"
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun twoArgs(a: String, b: String) = "$a$b"
|
||||||
|
|
||||||
|
fun ordinary() = "OK"
|
||||||
|
|
||||||
|
var log = ""
|
||||||
|
|
||||||
|
var proceed = {}
|
||||||
|
|
||||||
|
suspend fun suspendHere() = suspendCoroutineUninterceptedOrReturn<Unit> { cont ->
|
||||||
|
proceed = {
|
||||||
|
cont.resumeWith(SuccessOrFailure.success(Unit))
|
||||||
|
}
|
||||||
|
COROUTINE_SUSPENDED
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun suspending() {
|
||||||
|
log += "before;"
|
||||||
|
suspendHere()
|
||||||
|
log += "after;"
|
||||||
|
}
|
||||||
|
|
||||||
|
fun box(): String {
|
||||||
|
var res: String? = ""
|
||||||
|
builder {
|
||||||
|
res = A::class.members.find { it.name == "noArgs" }?.callSuspend(A()) as String?
|
||||||
|
}
|
||||||
|
if (res != "OK") return res ?: "FAIL 1"
|
||||||
|
builder {
|
||||||
|
res = A::class.members.find { it.name == "twoArgs" }?.callSuspend(A(), "O", "K") as String?
|
||||||
|
}
|
||||||
|
if (res != "OK") return res ?: "FAIL 2"
|
||||||
|
builder {
|
||||||
|
res = ::twoArgs.callSuspend("O", "K") as String?
|
||||||
|
}
|
||||||
|
if (res != "OK") return res ?: "FAIL 3"
|
||||||
|
builder {
|
||||||
|
res = ::ordinary.callSuspend() as String?
|
||||||
|
}
|
||||||
|
builder {
|
||||||
|
::suspending.callSuspend()
|
||||||
|
}
|
||||||
|
log += "suspended;"
|
||||||
|
proceed()
|
||||||
|
if (log != "before;suspended;after;") return log
|
||||||
|
return res ?: "FAIL 4"
|
||||||
|
}
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
// !LANGUAGE: +ReleaseCoroutines
|
||||||
|
// WITH_COROUTINES
|
||||||
|
// WITH_REFLECT
|
||||||
|
|
||||||
|
import helpers.*
|
||||||
|
import kotlin.coroutines.*
|
||||||
|
import kotlin.coroutines.intrinsics.*
|
||||||
|
import kotlin.reflect.full.callSuspendBy
|
||||||
|
|
||||||
|
fun builder(c: suspend () -> Unit) {
|
||||||
|
c.startCoroutine(EmptyContinuation)
|
||||||
|
}
|
||||||
|
|
||||||
|
class A {
|
||||||
|
suspend fun noArgs() = "OK"
|
||||||
|
|
||||||
|
suspend fun twoArgs(a: String, b: String) = "$a$b"
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun twoArgs(a: String, b: String) = "$a$b"
|
||||||
|
|
||||||
|
fun ordinary() = "OK"
|
||||||
|
|
||||||
|
suspend fun withDefault(s: String = "OK") = s
|
||||||
|
|
||||||
|
var log = ""
|
||||||
|
|
||||||
|
var proceed = {}
|
||||||
|
|
||||||
|
suspend fun suspendHere() = suspendCoroutineUninterceptedOrReturn<Unit> { cont ->
|
||||||
|
proceed = {
|
||||||
|
cont.resumeWith(SuccessOrFailure.success(Unit))
|
||||||
|
}
|
||||||
|
COROUTINE_SUSPENDED
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun suspending() {
|
||||||
|
log += "before;"
|
||||||
|
suspendHere()
|
||||||
|
log += "after;"
|
||||||
|
}
|
||||||
|
|
||||||
|
fun box(): String {
|
||||||
|
var res: String? = ""
|
||||||
|
builder {
|
||||||
|
val callable = A::class.members.find { it.name == "noArgs" }!!
|
||||||
|
res = callable.callSuspendBy(mapOf(callable.parameters.first() to A())) as String?
|
||||||
|
}
|
||||||
|
if (res != "OK") return res ?: "FAIL 1"
|
||||||
|
builder {
|
||||||
|
val callable = A::class.members.find { it.name == "twoArgs" }!!
|
||||||
|
res = callable.callSuspendBy(mapOf(callable.parameters[0] to A(), callable.parameters[1] to "O", callable.parameters[2] to "K")) as String?
|
||||||
|
}
|
||||||
|
if (res != "OK") return res ?: "FAIL 2"
|
||||||
|
builder {
|
||||||
|
res = ::twoArgs.callSuspendBy(mapOf(::twoArgs.parameters[0] to "O", ::twoArgs.parameters[1] to "K")) as String?
|
||||||
|
}
|
||||||
|
if (res != "OK") return res ?: "FAIL 3"
|
||||||
|
builder {
|
||||||
|
res = ::ordinary.callSuspendBy(emptyMap()) as String?
|
||||||
|
}
|
||||||
|
if (res != "OK") return res ?: "FAIL 4"
|
||||||
|
builder {
|
||||||
|
res = ::withDefault.callSuspendBy(emptyMap()) as String?
|
||||||
|
}
|
||||||
|
builder {
|
||||||
|
::suspending.callSuspendBy(emptyMap())
|
||||||
|
}
|
||||||
|
log += "suspended;"
|
||||||
|
proceed()
|
||||||
|
if (log != "before;suspended;after;") return log
|
||||||
|
return res ?: "FAIL 5"
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
// LANGUAGE_VERSION: 1.2
|
||||||
|
// WITH_COROUTINES
|
||||||
|
// WITH_REFLECT
|
||||||
|
|
||||||
|
import helpers.*
|
||||||
|
import kotlin.coroutines.experimental.*
|
||||||
|
|
||||||
|
class A {
|
||||||
|
fun noArgs() = "OK"
|
||||||
|
}
|
||||||
|
|
||||||
|
fun box(): String {
|
||||||
|
if (A::noArgs.isSuspend) return "FAIL"
|
||||||
|
return "OK"
|
||||||
|
}
|
||||||
@@ -9,6 +9,7 @@
|
|||||||
|
|
||||||
import kotlin.test.assertTrue
|
import kotlin.test.assertTrue
|
||||||
import kotlin.test.assertFalse
|
import kotlin.test.assertFalse
|
||||||
|
import kotlin.reflect.full.isSuspend
|
||||||
|
|
||||||
inline fun inline() {}
|
inline fun inline() {}
|
||||||
class External { external fun external() }
|
class External { external fun external() }
|
||||||
@@ -60,6 +61,7 @@ fun box(): String {
|
|||||||
assertFalse(::inlineProperty.getter.isExternal)
|
assertFalse(::inlineProperty.getter.isExternal)
|
||||||
assertTrue(::inlineProperty.getter.isInline)
|
assertTrue(::inlineProperty.getter.isInline)
|
||||||
assertTrue(::inlineProperty.setter.isInline)
|
assertTrue(::inlineProperty.setter.isInline)
|
||||||
|
assertFalse(::inlineProperty.isSuspend)
|
||||||
|
|
||||||
return "OK"
|
return "OK"
|
||||||
}
|
}
|
||||||
|
|||||||
+28
@@ -7390,6 +7390,34 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("compiler/testData/codegen/box/coroutines/reflect")
|
||||||
|
@TestDataPath("$PROJECT_ROOT")
|
||||||
|
@RunWith(JUnit3RunnerWithInners.class)
|
||||||
|
public static class Reflect extends AbstractBlackBoxCodegenTest {
|
||||||
|
private void runTest(String testDataFilePath) throws Exception {
|
||||||
|
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testAllFilesPresentInReflect() throws Exception {
|
||||||
|
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/coroutines/reflect"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("callSuspend.kt")
|
||||||
|
public void testCallSuspend() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/coroutines/reflect/callSuspend.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("callSuspendBy.kt")
|
||||||
|
public void testCallSuspendBy() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/coroutines/reflect/callSuspendBy.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("isSuspend12.kt")
|
||||||
|
public void testIsSuspend12() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/coroutines/reflect/isSuspend12.kt");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding")
|
@TestMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding")
|
||||||
@TestDataPath("$PROJECT_ROOT")
|
@TestDataPath("$PROJECT_ROOT")
|
||||||
@RunWith(JUnit3RunnerWithInners.class)
|
@RunWith(JUnit3RunnerWithInners.class)
|
||||||
|
|||||||
+28
@@ -7390,6 +7390,34 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("compiler/testData/codegen/box/coroutines/reflect")
|
||||||
|
@TestDataPath("$PROJECT_ROOT")
|
||||||
|
@RunWith(JUnit3RunnerWithInners.class)
|
||||||
|
public static class Reflect extends AbstractLightAnalysisModeTest {
|
||||||
|
private void runTest(String testDataFilePath) throws Exception {
|
||||||
|
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testAllFilesPresentInReflect() throws Exception {
|
||||||
|
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/coroutines/reflect"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("callSuspend.kt")
|
||||||
|
public void testCallSuspend() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/coroutines/reflect/callSuspend.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("callSuspendBy.kt")
|
||||||
|
public void testCallSuspendBy() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/coroutines/reflect/callSuspendBy.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("isSuspend12.kt")
|
||||||
|
public void testIsSuspend12() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/coroutines/reflect/isSuspend12.kt");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding")
|
@TestMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding")
|
||||||
@TestDataPath("$PROJECT_ROOT")
|
@TestDataPath("$PROJECT_ROOT")
|
||||||
@RunWith(JUnit3RunnerWithInners.class)
|
@RunWith(JUnit3RunnerWithInners.class)
|
||||||
|
|||||||
+28
@@ -7390,6 +7390,34 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("compiler/testData/codegen/box/coroutines/reflect")
|
||||||
|
@TestDataPath("$PROJECT_ROOT")
|
||||||
|
@RunWith(JUnit3RunnerWithInners.class)
|
||||||
|
public static class Reflect extends AbstractIrBlackBoxCodegenTest {
|
||||||
|
private void runTest(String testDataFilePath) throws Exception {
|
||||||
|
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testAllFilesPresentInReflect() throws Exception {
|
||||||
|
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/coroutines/reflect"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM_IR, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("callSuspend.kt")
|
||||||
|
public void testCallSuspend() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/coroutines/reflect/callSuspend.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("callSuspendBy.kt")
|
||||||
|
public void testCallSuspendBy() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/coroutines/reflect/callSuspendBy.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("isSuspend12.kt")
|
||||||
|
public void testIsSuspend12() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/coroutines/reflect/isSuspend12.kt");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding")
|
@TestMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding")
|
||||||
@TestDataPath("$PROJECT_ROOT")
|
@TestDataPath("$PROJECT_ROOT")
|
||||||
@RunWith(JUnit3RunnerWithInners.class)
|
@RunWith(JUnit3RunnerWithInners.class)
|
||||||
|
|||||||
@@ -1,17 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2010-2017 JetBrains s.r.o.
|
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
|
||||||
*
|
* that can be found in the license/LICENSE.txt file.
|
||||||
* 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.generators.tests
|
package org.jetbrains.kotlin.generators.tests
|
||||||
|
|||||||
@@ -1,17 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2010-2015 JetBrains s.r.o.
|
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
|
||||||
*
|
* that can be found in the license/LICENSE.txt file.
|
||||||
* 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 kotlin.reflect
|
package kotlin.reflect
|
||||||
@@ -87,4 +76,10 @@ public interface KCallable<out R> : KAnnotatedElement {
|
|||||||
*/
|
*/
|
||||||
@SinceKotlin("1.1")
|
@SinceKotlin("1.1")
|
||||||
public val isAbstract: Boolean
|
public val isAbstract: Boolean
|
||||||
|
|
||||||
|
/**
|
||||||
|
* `true` if this is a suspending function.
|
||||||
|
*/
|
||||||
|
@SinceKotlin("1.3")
|
||||||
|
public val isSuspend: Boolean
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,17 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2010-2015 JetBrains s.r.o.
|
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
|
||||||
*
|
* that can be found in the license/LICENSE.txt file.
|
||||||
* 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 kotlin.reflect
|
package kotlin.reflect
|
||||||
@@ -56,5 +45,5 @@ public interface KFunction<out R> : KCallable<R>, Function<R> {
|
|||||||
* `true` if this is a suspending function.
|
* `true` if this is a suspending function.
|
||||||
*/
|
*/
|
||||||
@SinceKotlin("1.1")
|
@SinceKotlin("1.1")
|
||||||
public val isSuspend: Boolean
|
public override val isSuspend: Boolean
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,23 +1,15 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2010-2016 JetBrains s.r.o.
|
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
|
||||||
*
|
* that can be found in the license/LICENSE.txt file.
|
||||||
* 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.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@file:JvmName("KCallables")
|
@file:JvmName("KCallables")
|
||||||
package kotlin.reflect.full
|
package kotlin.reflect.full
|
||||||
|
|
||||||
|
import kotlin.coroutines.intrinsics.suspendCoroutineUninterceptedOrReturn
|
||||||
|
import kotlin.coroutines.Continuation
|
||||||
import kotlin.reflect.*
|
import kotlin.reflect.*
|
||||||
|
import kotlin.reflect.jvm.internal.*
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns a parameter representing the `this` instance needed to call this callable,
|
* Returns a parameter representing the `this` instance needed to call this callable,
|
||||||
@@ -49,3 +41,26 @@ val KCallable<*>.valueParameters: List<KParameter>
|
|||||||
fun KCallable<*>.findParameterByName(name: String): KParameter? {
|
fun KCallable<*>.findParameterByName(name: String): KParameter? {
|
||||||
return parameters.singleOrNull { it.name == name }
|
return parameters.singleOrNull { it.name == name }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calls a callable in the current suspend context. If the callable is not a suspend function, behaves as [KCallable.call].
|
||||||
|
* Otherwise, calls the suspend function with current continuation.
|
||||||
|
*/
|
||||||
|
@SinceKotlin("1.3")
|
||||||
|
suspend fun <R> KCallable<R>.callSuspend(vararg args: Any?): R {
|
||||||
|
if (!this.isSuspend) return call(*args)
|
||||||
|
if (this !is KFunction<*>) throw IllegalArgumentException("Cannot callSuspend on a property $this: suspend properties are not supported yet")
|
||||||
|
return suspendCoroutineUninterceptedOrReturn { call(*args, it) }
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calls a callable in the current suspend context. If the callable is not a suspend function, behaves as [KCallable.callBy].
|
||||||
|
* Otherwise, calls the suspend function with current continuation.
|
||||||
|
*/
|
||||||
|
@SinceKotlin("1.3")
|
||||||
|
suspend fun <R> KCallable<R>.callSuspendBy(args: Map<KParameter, Any?>): R {
|
||||||
|
if (!this.isSuspend) return callBy(args)
|
||||||
|
if (this !is KFunction<*>) throw IllegalArgumentException("Cannot callSuspendBy on a property $this: suspend properties are not supported yet")
|
||||||
|
val kCallable = asKCallableImpl() ?: throw KotlinReflectionInternalError("This callable does not support a default call: $this")
|
||||||
|
return suspendCoroutineUninterceptedOrReturn<R> { kCallable.callDefaultMethod(args, it) }
|
||||||
|
}
|
||||||
@@ -1,17 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2010-2015 JetBrains s.r.o.
|
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
|
||||||
*
|
* that can be found in the license/LICENSE.txt file.
|
||||||
* 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 kotlin.reflect.jvm.internal
|
package kotlin.reflect.jvm.internal
|
||||||
@@ -21,6 +10,7 @@ import org.jetbrains.kotlin.descriptors.Modality
|
|||||||
import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor
|
import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor
|
||||||
import java.lang.reflect.Type
|
import java.lang.reflect.Type
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
import kotlin.coroutines.Continuation
|
||||||
import kotlin.reflect.*
|
import kotlin.reflect.*
|
||||||
import kotlin.reflect.jvm.javaType
|
import kotlin.reflect.jvm.javaType
|
||||||
|
|
||||||
@@ -107,11 +97,11 @@ internal abstract class KCallableImpl<out R> : KCallable<R> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun callBy(args: Map<KParameter, Any?>): R {
|
override fun callBy(args: Map<KParameter, Any?>): R {
|
||||||
return if (isAnnotationConstructor) callAnnotationConstructor(args) else callDefaultMethod(args)
|
return if (isAnnotationConstructor) callAnnotationConstructor(args) else callDefaultMethod(args, null)
|
||||||
}
|
}
|
||||||
|
|
||||||
// See ArgumentGenerator#generate
|
// See ArgumentGenerator#generate
|
||||||
private fun callDefaultMethod(args: Map<KParameter, Any?>): R {
|
internal fun callDefaultMethod(args: Map<KParameter, Any?>, continuationArgument: Continuation<*>?): R {
|
||||||
val parameters = parameters
|
val parameters = parameters
|
||||||
val arguments = ArrayList<Any?>(parameters.size)
|
val arguments = ArrayList<Any?>(parameters.size)
|
||||||
var mask = 0
|
var mask = 0
|
||||||
@@ -144,6 +134,10 @@ internal abstract class KCallableImpl<out R> : KCallable<R> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (continuationArgument != null) {
|
||||||
|
arguments.add(continuationArgument)
|
||||||
|
}
|
||||||
|
|
||||||
if (!anyOptional) {
|
if (!anyOptional) {
|
||||||
return call(*arguments.toTypedArray())
|
return call(*arguments.toTypedArray())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,17 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2010-2015 JetBrains s.r.o.
|
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
|
||||||
*
|
* that can be found in the license/LICENSE.txt file.
|
||||||
* 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 kotlin.reflect.jvm.internal
|
package kotlin.reflect.jvm.internal
|
||||||
@@ -120,6 +109,8 @@ internal abstract class KPropertyImpl<out R> private constructor(
|
|||||||
|
|
||||||
override val isConst: Boolean get() = descriptor.isConst
|
override val isConst: Boolean get() = descriptor.isConst
|
||||||
|
|
||||||
|
override val isSuspend: Boolean get() = false
|
||||||
|
|
||||||
override fun equals(other: Any?): Boolean {
|
override fun equals(other: Any?): Boolean {
|
||||||
val that = other.asKPropertyImpl() ?: return false
|
val that = other.asKPropertyImpl() ?: return false
|
||||||
return container == that.container && name == that.name && signature == that.signature && boundReceiver == that.boundReceiver
|
return container == that.container && name == that.name && signature == that.signature && boundReceiver == that.boundReceiver
|
||||||
|
|||||||
+28
@@ -6230,6 +6230,34 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("compiler/testData/codegen/box/coroutines/reflect")
|
||||||
|
@TestDataPath("$PROJECT_ROOT")
|
||||||
|
@RunWith(JUnit3RunnerWithInners.class)
|
||||||
|
public static class Reflect extends AbstractIrJsCodegenBoxTest {
|
||||||
|
private void runTest(String testDataFilePath) throws Exception {
|
||||||
|
KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testAllFilesPresentInReflect() throws Exception {
|
||||||
|
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/coroutines/reflect"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JS_IR, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("callSuspend.kt")
|
||||||
|
public void testCallSuspend() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/coroutines/reflect/callSuspend.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("callSuspendBy.kt")
|
||||||
|
public void testCallSuspendBy() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/coroutines/reflect/callSuspendBy.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("isSuspend12.kt")
|
||||||
|
public void testIsSuspend12() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/coroutines/reflect/isSuspend12.kt");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding")
|
@TestMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding")
|
||||||
@TestDataPath("$PROJECT_ROOT")
|
@TestDataPath("$PROJECT_ROOT")
|
||||||
@RunWith(JUnit3RunnerWithInners.class)
|
@RunWith(JUnit3RunnerWithInners.class)
|
||||||
|
|||||||
+28
@@ -7080,6 +7080,34 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("compiler/testData/codegen/box/coroutines/reflect")
|
||||||
|
@TestDataPath("$PROJECT_ROOT")
|
||||||
|
@RunWith(JUnit3RunnerWithInners.class)
|
||||||
|
public static class Reflect extends AbstractJsCodegenBoxTest {
|
||||||
|
private void runTest(String testDataFilePath) throws Exception {
|
||||||
|
KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testAllFilesPresentInReflect() throws Exception {
|
||||||
|
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/coroutines/reflect"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JS, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("callSuspend.kt")
|
||||||
|
public void testCallSuspend() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/coroutines/reflect/callSuspend.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("callSuspendBy.kt")
|
||||||
|
public void testCallSuspendBy() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/coroutines/reflect/callSuspendBy.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("isSuspend12.kt")
|
||||||
|
public void testIsSuspend12() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/coroutines/reflect/isSuspend12.kt");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding")
|
@TestMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding")
|
||||||
@TestDataPath("$PROJECT_ROOT")
|
@TestDataPath("$PROJECT_ROOT")
|
||||||
@RunWith(JUnit3RunnerWithInners.class)
|
@RunWith(JUnit3RunnerWithInners.class)
|
||||||
|
|||||||
@@ -166,4 +166,10 @@ public abstract class CallableReference implements KCallable, Serializable {
|
|||||||
public boolean isAbstract() {
|
public boolean isAbstract() {
|
||||||
return getReflected().isAbstract();
|
return getReflected().isAbstract();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@SinceKotlin(version = "1.3")
|
||||||
|
public boolean isSuspend() {
|
||||||
|
return getReflected().isSuspend();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user