[FIR] move deprecation calculation to COMPILER_REQUIRED_ANNOTATIONS phase
Also, this change adds SinceKotlin and Java.Deprecated to this phase It fixes some problems with API_NOT_AVAILABLE, so now it is closer to K1 ^KT-57648 Fixed ^KT-55723 Fixed
This commit is contained in:
committed by
Space Team
parent
add47aa041
commit
9a267176f5
Vendored
+6
-6
@@ -23,16 +23,16 @@ class A {
|
||||
import p1.*
|
||||
import p2.*
|
||||
|
||||
fun test(a: <!OVERLOAD_RESOLUTION_AMBIGUITY!>A<!>) {
|
||||
<!CONFLICTING_OVERLOADS!>fun test(a: A)<!> {
|
||||
a.<!UNRESOLVED_REFERENCE!>m1<!>()
|
||||
a.<!UNRESOLVED_REFERENCE!>m2<!>()
|
||||
a.m2()
|
||||
}
|
||||
|
||||
// FILE: explicitlyImportP1.kt
|
||||
import p1.A
|
||||
import p1.<!API_NOT_AVAILABLE!>A<!>
|
||||
import p2.*
|
||||
|
||||
fun test(a: A) {
|
||||
a.m1()
|
||||
a.<!UNRESOLVED_REFERENCE!>m2<!>()
|
||||
<!CONFLICTING_OVERLOADS!>fun test(a: A)<!> {
|
||||
a.<!UNRESOLVED_REFERENCE!>m1<!>()
|
||||
a.m2()
|
||||
}
|
||||
|
||||
Vendored
+4
-4
@@ -26,12 +26,12 @@ class A(val v3: Unit)
|
||||
// MODULE: m4(m1, m2, m3)
|
||||
// FILE: oneExplicitImportOtherStars.kt
|
||||
import p1.*
|
||||
import p2.A
|
||||
import p2.<!API_NOT_AVAILABLE!>A<!>
|
||||
import p3.*
|
||||
|
||||
fun test(a: A) {
|
||||
fun test(a: <!NONE_APPLICABLE!>A<!>) {
|
||||
a.<!UNRESOLVED_REFERENCE!>v1<!>
|
||||
a.v2
|
||||
a.<!UNRESOLVED_REFERENCE!>v2<!>
|
||||
a.<!UNRESOLVED_REFERENCE!>v3<!>
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ import p1.*
|
||||
import p2.*
|
||||
import p3.*
|
||||
|
||||
fun test(a: <!OVERLOAD_RESOLUTION_AMBIGUITY!>A<!>) {
|
||||
fun test(a: <!NONE_APPLICABLE!>A<!>) {
|
||||
a.<!UNRESOLVED_REFERENCE!>v1<!>
|
||||
a.<!UNRESOLVED_REFERENCE!>v2<!>
|
||||
a.<!UNRESOLVED_REFERENCE!>v3<!>
|
||||
|
||||
Reference in New Issue
Block a user