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

[JS IR] Fix case with bridge with nested classes

Browse Source 
^KT-54686 fixed
This commit is contained in:
Ilya Goncharov
2022-10-26 12:56:03 +00:00
committed by Space Team
parent 2e48557a0d
commit fd5fba6f09
12 changed files with 75 additions and 9 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
@@ -2363,6 +2363,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/bridges/methodFromTrait.kt");
}
@Test
@TestMetadata("nestedClassTypeParameters.kt")
public void testNestedClassTypeParameters() throws Exception {
runTest("compiler/testData/codegen/box/bridges/nestedClassTypeParameters.kt");
}
@Test
@TestMetadata("noBridgeOnMutableCollectionInheritance.kt")
public void testNoBridgeOnMutableCollectionInheritance() throws Exception {
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIrBackendContext.kt
-6
View File
@@ -415,10 +415,4 @@ class JsIrBackendContext(
outlinedJsCodeFunctions[symbol] = parsedJsFunction
return parsedJsFunction
}
private var irFunctionSignatureCache = hashMapOf<IrFunction, String>()
fun getFunctionSignatureFromCache(f: IrFunction): String {
return irFunctionSignatureCache.getOrPut(f) { calculateJsFunctionSignature(f, this) }
}
}
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsBridgesConstruction.kt
+4 -1
View File
@@ -34,7 +34,10 @@ class JsBridgesConstruction(context: JsIrBackendContext) : BridgesConstruction<J
private val primitiveToLiteralConstructor = context.intrinsics.primitiveToLiteralConstructor
override fun getFunctionSignature(function: IrSimpleFunction) =
jsFunctionSignature(function, context)
jsFunctionSignature(
function,
context
)
override fun getBridgeOrigin(bridge: IrSimpleFunction): IrDeclarationOrigin =
when {
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/NameTables.kt
+5 -2
View File
@@ -158,7 +158,10 @@ fun calculateJsFunctionSignature(declaration: IrFunction, context: JsIrBackendCo
) + "_" + abs(signature.hashCode()).toString(Character.MAX_RADIX) + RESERVED_MEMBER_NAME_SUFFIX
}
fun jsFunctionSignature(declaration: IrFunction, context: JsIrBackendContext): String {
fun jsFunctionSignature(
declaration: IrFunction,
context: JsIrBackendContext
): String {
require(!declaration.isStaticMethodOfClass)
require(declaration.dispatchReceiverParameter != null)
@@ -172,7 +175,7 @@ fun jsFunctionSignature(declaration: IrFunction, context: JsIrBackendContext): S
}
val declarationSignature = (declaration as? IrSimpleFunction)?.resolveFakeOverride() ?: declaration
return context.getFunctionSignatureFromCache(declarationSignature)
return calculateJsFunctionSignature(declarationSignature, context)
}
class NameTables(
compiler/testData/codegen/box/bridges/nestedClassTypeParameters.kt
Vendored
+20
View File
@@ -0,0 +1,20 @@
class Outer {
class Inner {
fun foo() = "K"
}
}
interface I<T> {
fun foo(t: T, inner: Outer.Inner): String
}
open class Child : I<String> {
override fun foo(t: String, inner: Outer.Inner): String {
return t + inner.foo()
}
}
fun box(): String {
val child: I<String> = Child()
return child.foo("O", Outer.Inner())
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -2267,6 +2267,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/bridges/methodFromTrait.kt");
}
@Test
@TestMetadata("nestedClassTypeParameters.kt")
public void testNestedClassTypeParameters() throws Exception {
runTest("compiler/testData/codegen/box/bridges/nestedClassTypeParameters.kt");
}
@Test
@TestMetadata("noBridgeOnMutableCollectionInheritance.kt")
public void testNoBridgeOnMutableCollectionInheritance() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -2363,6 +2363,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/bridges/methodFromTrait.kt");
}
@Test
@TestMetadata("nestedClassTypeParameters.kt")
public void testNestedClassTypeParameters() throws Exception {
runTest("compiler/testData/codegen/box/bridges/nestedClassTypeParameters.kt");
}
@Test
@TestMetadata("noBridgeOnMutableCollectionInheritance.kt")
public void testNoBridgeOnMutableCollectionInheritance() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -1987,6 +1987,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/bridges/methodFromTrait.kt");
}
@TestMetadata("nestedClassTypeParameters.kt")
public void testNestedClassTypeParameters() throws Exception {
runTest("compiler/testData/codegen/box/bridges/nestedClassTypeParameters.kt");
}
@TestMetadata("noBridgeOnMutableCollectionInheritance.kt")
public void testNoBridgeOnMutableCollectionInheritance() throws Exception {
runTest("compiler/testData/codegen/box/bridges/noBridgeOnMutableCollectionInheritance.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -1541,6 +1541,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/bridges/methodFromTrait.kt");
}
@Test
@TestMetadata("nestedClassTypeParameters.kt")
public void testNestedClassTypeParameters() throws Exception {
runTest("compiler/testData/codegen/box/bridges/nestedClassTypeParameters.kt");
}
@Test
@TestMetadata("noBridgeOnMutableCollectionInheritance.kt")
public void testNoBridgeOnMutableCollectionInheritance() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -1595,6 +1595,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/bridges/methodFromTrait.kt");
}
@Test
@TestMetadata("nestedClassTypeParameters.kt")
public void testNestedClassTypeParameters() throws Exception {
runTest("compiler/testData/codegen/box/bridges/nestedClassTypeParameters.kt");
}
@Test
@TestMetadata("noBridgeOnMutableCollectionInheritance.kt")
public void testNoBridgeOnMutableCollectionInheritance() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -1417,6 +1417,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/bridges/methodFromTrait.kt");
}
@TestMetadata("nestedClassTypeParameters.kt")
public void testNestedClassTypeParameters() throws Exception {
runTest("compiler/testData/codegen/box/bridges/nestedClassTypeParameters.kt");
}
@TestMetadata("noBridgeOnMutableCollectionInheritance.kt")
public void testNoBridgeOnMutableCollectionInheritance() throws Exception {
runTest("compiler/testData/codegen/box/bridges/noBridgeOnMutableCollectionInheritance.kt");
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -1633,6 +1633,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
runTest("compiler/testData/codegen/box/bridges/methodFromTrait.kt");
}
@Test
@TestMetadata("nestedClassTypeParameters.kt")
public void testNestedClassTypeParameters() throws Exception {
runTest("compiler/testData/codegen/box/bridges/nestedClassTypeParameters.kt");
}
@Test
@TestMetadata("noBridgeOnMutableCollectionInheritance.kt")
public void testNoBridgeOnMutableCollectionInheritance() throws Exception {