K2: correctly set importedFromObjectOrStaticData for fields
#KT-59140 Fixed #KT-58980 Fixed
This commit is contained in:
committed by
Space Team
parent
18206210cf
commit
8983e3a218
@@ -0,0 +1,19 @@
|
||||
// TARGET_BACKEND: JVM_IR
|
||||
|
||||
// FILE: dependency/Base.kt
|
||||
|
||||
package dependency;
|
||||
|
||||
enum class Base(val s: String) {
|
||||
FIRST("O"),
|
||||
SECOND("K")
|
||||
}
|
||||
|
||||
// FILE: test/test.kt
|
||||
|
||||
package test
|
||||
|
||||
import dependency.Base.FIRST
|
||||
import dependency.Base.SECOND
|
||||
|
||||
fun box(): String = FIRST.s + SECOND.s
|
||||
@@ -0,0 +1,18 @@
|
||||
// TARGET_BACKEND: JVM_IR
|
||||
|
||||
// FILE: dependency/Base.java
|
||||
|
||||
package dependency;
|
||||
|
||||
public enum Base {
|
||||
O, K;
|
||||
}
|
||||
|
||||
// FILE: test/test.kt
|
||||
|
||||
package test
|
||||
|
||||
import dependency.Base.O
|
||||
import dependency.Base.K
|
||||
|
||||
fun box(): String = O.name + K.name
|
||||
@@ -0,0 +1,21 @@
|
||||
// TARGET_BACKEND: JVM_IR
|
||||
// ISSUE: KT-58980
|
||||
|
||||
// FILE: dependency/Base.java
|
||||
|
||||
package dependency;
|
||||
|
||||
public class Base {
|
||||
public String string = "OK";
|
||||
}
|
||||
|
||||
// FILE: test/test.kt
|
||||
|
||||
package test
|
||||
|
||||
import dependency.Base
|
||||
import test.KtObject.string
|
||||
|
||||
object KtObject : Base()
|
||||
|
||||
fun box(): String = string
|
||||
@@ -0,0 +1,20 @@
|
||||
// TARGET_BACKEND: JVM_IR
|
||||
// ISSUE: KT-59140
|
||||
|
||||
// FILE: pkg/Foo.java
|
||||
|
||||
package pkg;
|
||||
|
||||
abstract class CommonFoo {
|
||||
public static final String BAR = "OK";
|
||||
}
|
||||
|
||||
public class Foo extends CommonFoo {}
|
||||
|
||||
// FILE: test.kt
|
||||
|
||||
import pkg.Foo.BAR
|
||||
|
||||
fun box(): String {
|
||||
return BAR
|
||||
}
|
||||
Reference in New Issue
Block a user