[JS IR] Fix a IC dependency building for class methods.
The patch fixes lost IC dependencies for inherited class or interface methods. Especially between a fake override function and its implementation. Since IrSymbolDeserializer doesn't provide all class methods, they are collected from the class definitions. ^KT-53063 Fixed
This commit is contained in:
Alexander Korepanov
committed by
Space
Space
parent
edbccd0add
commit
6525f7a7ac
Vendored
+3
@@ -0,0 +1,3 @@
|
||||
open class Module2OpenClass {
|
||||
public suspend fun testFunction2() = 2
|
||||
}
|
||||
Vendored
+4
@@ -0,0 +1,4 @@
|
||||
open class Module2OpenClass {
|
||||
public suspend fun testFunction2() = 2
|
||||
public fun testFunction22() = 22
|
||||
}
|
||||
js/js.translator/testData/incremental/invalidation/fakeOverrideClassFunctionQualifiers/lib1/l1.10.kt
Vendored
+2
@@ -0,0 +1,2 @@
|
||||
open class Module2OpenClass {
|
||||
}
|
||||
Vendored
+4
@@ -0,0 +1,4 @@
|
||||
open class Module2OpenClass {
|
||||
public fun testFunction2() = 2
|
||||
public fun testFunction22() = 22
|
||||
}
|
||||
Vendored
+7
@@ -0,0 +1,7 @@
|
||||
open class Module2OpenClass {
|
||||
public fun testFunction2() = 2
|
||||
public fun testFunction22() = 22
|
||||
|
||||
public val testField222: Int
|
||||
get() = 222
|
||||
}
|
||||
Vendored
+7
@@ -0,0 +1,7 @@
|
||||
open class Module2OpenClass {
|
||||
public fun testFunction2() = 20
|
||||
public fun testFunction22() = 220
|
||||
|
||||
public val testField222: Int
|
||||
get() = 2220
|
||||
}
|
||||
Vendored
+7
@@ -0,0 +1,7 @@
|
||||
open class Module2OpenClass {
|
||||
public fun testFunction2() = 20
|
||||
inline public fun testFunction22() = 220
|
||||
|
||||
public val testField222: Int
|
||||
get() = 2220
|
||||
}
|
||||
Vendored
+7
@@ -0,0 +1,7 @@
|
||||
open class Module2OpenClass {
|
||||
public fun testFunction2() = 20
|
||||
inline public fun testFunction22() = 220
|
||||
|
||||
inline public val testField222: Int
|
||||
get() = 2220
|
||||
}
|
||||
Vendored
+7
@@ -0,0 +1,7 @@
|
||||
open class Module2OpenClass {
|
||||
public fun testFunction2() = 20
|
||||
inline public fun testFunction22() = 2201
|
||||
|
||||
inline public val testField222: Int
|
||||
get() = 2220
|
||||
}
|
||||
Vendored
+7
@@ -0,0 +1,7 @@
|
||||
open class Module2OpenClass {
|
||||
public fun testFunction2() = 20
|
||||
inline public fun testFunction22() = 2201
|
||||
|
||||
inline public val testField222: Int
|
||||
get() = 22201
|
||||
}
|
||||
+48
@@ -0,0 +1,48 @@
|
||||
STEP 0:
|
||||
modifications:
|
||||
U : l1.0.kt -> l1.kt
|
||||
added file: l1.kt
|
||||
STEP 1:
|
||||
modifications:
|
||||
U : l1.1.kt -> l1.kt
|
||||
modified ir: l1.kt
|
||||
updated exports: l1.kt
|
||||
STEP 2:
|
||||
modifications:
|
||||
U : l1.2.kt -> l1.kt
|
||||
modified ir: l1.kt
|
||||
STEP 3:
|
||||
modifications:
|
||||
U : l1.3.kt -> l1.kt
|
||||
modified ir: l1.kt
|
||||
STEP 4:
|
||||
updated exports: l1.kt
|
||||
STEP 5:
|
||||
modifications:
|
||||
U : l1.5.kt -> l1.kt
|
||||
modified ir: l1.kt
|
||||
STEP 6:
|
||||
modifications:
|
||||
U : l1.6.kt -> l1.kt
|
||||
modified ir: l1.kt
|
||||
STEP 7:
|
||||
modifications:
|
||||
U : l1.7.kt -> l1.kt
|
||||
modified ir: l1.kt
|
||||
STEP 8:
|
||||
modifications:
|
||||
U : l1.8.kt -> l1.kt
|
||||
modified ir: l1.kt
|
||||
STEP 9:
|
||||
modifications:
|
||||
U : l1.9.kt -> l1.kt
|
||||
modified ir: l1.kt
|
||||
STEP 10:
|
||||
modifications:
|
||||
U : l1.10.kt -> l1.kt
|
||||
modified ir: l1.kt
|
||||
updated exports: l1.kt
|
||||
STEP 11:
|
||||
modifications:
|
||||
U : l1.0.kt -> l1.kt
|
||||
modified ir: l1.kt
|
||||
Vendored
+3
@@ -0,0 +1,3 @@
|
||||
class Module1Class: Module2OpenClass() {
|
||||
fun testFunction1() = 1
|
||||
}
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
STEP 0:
|
||||
dependencies: lib1
|
||||
added file: l2.kt
|
||||
STEP 1:
|
||||
dependencies: lib1
|
||||
updated exports: l2.kt
|
||||
STEP 2:
|
||||
dependencies: lib1
|
||||
updated imports: l2.kt
|
||||
STEP 3:
|
||||
dependencies: lib1
|
||||
STEP 4:
|
||||
dependencies: lib1
|
||||
updated exports: l2.kt
|
||||
STEP 5:
|
||||
dependencies: lib1
|
||||
STEP 6..9:
|
||||
dependencies: lib1
|
||||
updated imports: l2.kt
|
||||
STEP 10:
|
||||
dependencies: lib1
|
||||
updated imports: l2.kt
|
||||
updated exports: l2.kt
|
||||
STEP 11:
|
||||
dependencies: lib1
|
||||
Vendored
+10
@@ -0,0 +1,10 @@
|
||||
fun box(stepId: Int): String {
|
||||
val obj = Module1Class()
|
||||
when (stepId) {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 -> {
|
||||
if (obj.testFunction1() != 1) return "Fail 1"
|
||||
}
|
||||
else -> return "Unknown"
|
||||
}
|
||||
return "OK"
|
||||
}
|
||||
Vendored
+11
@@ -0,0 +1,11 @@
|
||||
fun box(stepId: Int): String {
|
||||
val obj = Module1Class()
|
||||
when (stepId) {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 -> {
|
||||
if (obj.testFunction1() != 1) return "Fail 1"
|
||||
if (obj.testFunction22() != 22) return "Fail 22"
|
||||
}
|
||||
else -> return "Unknown"
|
||||
}
|
||||
return "OK"
|
||||
}
|
||||
Vendored
+27
@@ -0,0 +1,27 @@
|
||||
fun box(stepId: Int): String {
|
||||
val obj = Module1Class()
|
||||
when (stepId) {
|
||||
0, 1, 2, 3, 4, 10, 11 -> {
|
||||
if (obj.testFunction1() != 1) return "Fail 1"
|
||||
if (obj.testFunction22() != 22) return "Fail 22"
|
||||
if (obj.testField222 != 222) return "Fail 222"
|
||||
}
|
||||
5, 6, 7 -> {
|
||||
if (obj.testFunction1() != 1) return "Fail 1"
|
||||
if (obj.testFunction22() != 220) return "Fail 220"
|
||||
if (obj.testField222 != 2220) return "Fail 2220"
|
||||
}
|
||||
8 -> {
|
||||
if (obj.testFunction1() != 1) return "Fail 1"
|
||||
if (obj.testFunction22() != 2201) return "Fail 2201"
|
||||
if (obj.testField222 != 2220) return "Fail 2220"
|
||||
}
|
||||
9 -> {
|
||||
if (obj.testFunction1() != 1) return "Fail 1"
|
||||
if (obj.testFunction22() != 2201) return "Fail 2201"
|
||||
if (obj.testField222 != 22201) return "Fail 22201"
|
||||
}
|
||||
else -> return "Unknown"
|
||||
}
|
||||
return "OK"
|
||||
}
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
STEP 0:
|
||||
modifications:
|
||||
U : m.0.kt -> m.kt
|
||||
dependencies: lib1, lib2
|
||||
added file: m.kt
|
||||
STEP 1:
|
||||
modifications:
|
||||
U : m.1.kt -> m.kt
|
||||
dependencies: lib1, lib2
|
||||
modified ir: m.kt
|
||||
STEP 2:
|
||||
dependencies: lib1, lib2
|
||||
STEP 3:
|
||||
dependencies: lib1, lib2
|
||||
STEP 4:
|
||||
dependencies: lib1, lib2
|
||||
modifications:
|
||||
U : m.4.kt -> m.kt
|
||||
modified ir: m.kt
|
||||
STEP 5:
|
||||
dependencies: lib1, lib2
|
||||
STEP 6..9:
|
||||
dependencies: lib1, lib2
|
||||
updated imports: m.kt
|
||||
STEP 10:
|
||||
modifications:
|
||||
U : m.0.kt -> m.kt
|
||||
dependencies: lib1, lib2
|
||||
modified ir: m.kt
|
||||
STEP 11:
|
||||
dependencies: lib1, lib2
|
||||
Vendored
+23
@@ -0,0 +1,23 @@
|
||||
MODULES: lib1, lib2, main
|
||||
|
||||
STEP 0..1:
|
||||
libs: lib1, lib2, main
|
||||
dirty js: lib1, lib2, main
|
||||
STEP 2:
|
||||
libs: lib1, lib2, main
|
||||
dirty js: lib1, lib2
|
||||
STEP 3:
|
||||
libs: lib1, lib2, main
|
||||
dirty js: lib1
|
||||
STEP 4:
|
||||
libs: lib1, lib2, main
|
||||
dirty js: main, lib1, lib2
|
||||
STEP 5:
|
||||
libs: lib1, lib2, main
|
||||
dirty js: lib1
|
||||
STEP 6..10:
|
||||
libs: lib1, lib2, main
|
||||
dirty js: lib1, lib2, main
|
||||
STEP 11:
|
||||
libs: lib1, lib2, main
|
||||
dirty js: lib1
|
||||
Reference in New Issue
Block a user