azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[JVM IR] Copy attributes for JVM_STATIC_WRAPPERS.

Browse Source
This commit is contained in:
Mads Ager
2021-05-10 15:57:31 +02:00
committed by Alexander Udalov
parent 3db5ba98ad
commit d397efb2bd
10 changed files with 62 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -9084,6 +9084,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/coroutines/iterateOverArray.kt");
}
@Test
@TestMetadata("jvmStaticAndJvmInline.kt")
public void testJvmStaticAndJvmInline() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/jvmStaticAndJvmInline.kt");
}
@Test
@TestMetadata("kt12958.kt")
public void testKt12958() throws Exception {
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmCachedDeclarations.kt
+1
View File
@@ -196,6 +196,7 @@ class JvmCachedDeclarations(
isSuspend = target.isSuspend
}.apply proxy@{
parent = this@makeProxy
copyAttributes(target)
copyTypeParametersFrom(target)
copyAnnotationsFrom(target)
if (!isStatic) {
compiler/testData/codegen/box/coroutines/jvmStaticAndJvmInline.kt
Vendored
+38
View File
@@ -0,0 +1,38 @@
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// WITH_COROUTINES
import helpers.*
import kotlin.coroutines.*
import kotlin.coroutines.intrinsics.*
fun builder(c: suspend () -> Unit) {
c.startCoroutine(EmptyContinuation)
}
suspend fun <T> suspendHere(x: T): T = suspendCoroutineUninterceptedOrReturn {
it.resume(x)
COROUTINE_SUSPENDED
}
inline class I(val x: Any?)
open class C {
companion object {
@JvmStatic
protected suspend fun f(): I = I(suspendHere("OK"))
}
}
class D : C() {
companion object {
suspend fun g() = f()
}
}
fun box(): String {
var result = "FAIL"
builder {
result = D.g().x as String
}
return result
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -9084,6 +9084,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/coroutines/iterateOverArray.kt");
}
@Test
@TestMetadata("jvmStaticAndJvmInline.kt")
public void testJvmStaticAndJvmInline() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/jvmStaticAndJvmInline.kt");
}
@Test
@TestMetadata("kt12958.kt")
public void testKt12958() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -9084,6 +9084,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/coroutines/iterateOverArray.kt");
}
@Test
@TestMetadata("jvmStaticAndJvmInline.kt")
public void testJvmStaticAndJvmInline() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/jvmStaticAndJvmInline.kt");
}
@Test
@TestMetadata("kt12958.kt")
public void testKt12958() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -7104,6 +7104,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/coroutines/iterateOverArray.kt");
}
@TestMetadata("jvmStaticAndJvmInline.kt")
public void testJvmStaticAndJvmInline() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/jvmStaticAndJvmInline.kt");
}
@TestMetadata("kt12958.kt")
public void testKt12958() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/kt12958.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
Generated
-5
View File
@@ -15960,11 +15960,6 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvmStatic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true);
}
@TestMetadata("kt46568.kt")
public void testKt46568() throws Exception {
runTest("compiler/testData/codegen/box/jvmStatic/kt46568.kt");
}
@TestMetadata("compiler/testData/codegen/box/jvmStatic/protectedInSuperClass")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
Generated
-5
View File
@@ -15371,11 +15371,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvmStatic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
}
@TestMetadata("kt46568.kt")
public void testKt46568() throws Exception {
runTest("compiler/testData/codegen/box/jvmStatic/kt46568.kt");
}
@TestMetadata("compiler/testData/codegen/box/jvmStatic/protectedInSuperClass")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
-5
View File
@@ -15436,11 +15436,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvmStatic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true);
}
@TestMetadata("kt46568.kt")
public void testKt46568() throws Exception {
runTest("compiler/testData/codegen/box/jvmStatic/kt46568.kt");
}
@TestMetadata("compiler/testData/codegen/box/jvmStatic/protectedInSuperClass")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
-5
View File
@@ -9181,11 +9181,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvmStatic"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
}
@TestMetadata("kt46568.kt")
public void testKt46568() throws Exception {
runTest("compiler/testData/codegen/box/jvmStatic/kt46568.kt");
}
@TestMetadata("compiler/testData/codegen/box/jvmStatic/protectedInSuperClass")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)