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

[FIR2IR] Correctly calculate ir origin for f/o callables in declarations generator

Browse Source 
This change uncovers one problem, which causes some MPP tests to fail
This problem will be fixed in further commits

Uncovers KT-62535
This commit is contained in:
Dmitriy Novozhilov
2023-09-21 13:37:23 +03:00
committed by Space Team
parent 50425e82c5
commit 34d0f3dbc2
5 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/multiplatform/hmpp/simple.kt
Vendored
+3 -2
View File
@@ -5,9 +5,10 @@
// WITH_STDLIB
// !LANGUAGE: +MultiPlatformProjects
// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-62535
// TARGET_BACKEND: JVM
// IGNORE_BACKEND_K2: JVM_IR
// REASON: K2 incorrectly generates IR for B.bar f/o
// MODULE: common
// TARGET_PLATFORM: Common
compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt
Vendored
+4 -1
View File
@@ -1,6 +1,9 @@
// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
// WITH_STDLIB
// !LANGUAGE: +MultiPlatformProjects
// IGNORE_BACKEND_K2: JVM_IR
// REASON: K2 incorrectly generates IR for S1.p f/o
// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-62535
// MODULE: common
// TARGET_PLATFORM: Common
@@ -41,4 +44,4 @@ fun box(): String {
} else {
"FAIL"
}
}
}
compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt
Vendored
+4 -1
View File
@@ -1,6 +1,9 @@
// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
// WITH_STDLIB
// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-62535
// !LANGUAGE: +MultiPlatformProjects
// IGNORE_BACKEND_K2: ANY
// REASON: K2 incorrectly generates IR for S2.s3 f/o
// MODULE: common
// TARGET_PLATFORM: Common
@@ -39,4 +42,4 @@ actual interface S : S1, S2 {
fun s3() = s1() + s2()
}
fun box() = B().s3()
fun box() = B().s3()