Skip to content

Commit fb8d334

Browse files
mglukhikhmglukhikh
committed
Revert "K2: implement equality for ConeAttribute.EnhancedNullability"
This reverts commit 3627d2c.
1 parent 412afb7 commit fb8d334

4 files changed

Lines changed: 21 additions & 24 deletions

File tree

‎compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/CompilerConeAttributes.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@ object CompilerConeAttributes {
5454
override val key: KClass<out EnhancedNullability> = EnhancedNullability::class
5555
override val keepInInferredDeclarationType: Boolean get() = true
5656

57-
override val implementsEquality: Boolean
58-
get() = true
59-
6057
override fun toString(): String = "@EnhancedNullability"
6158
}
6259

‎compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/unstableEnhancedNullability.fir.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class C {
1818
r() <!USELESS_CAST!>as String<!>
1919
for (p in P.f()) {
2020
// Should be @NonNull String
21-
<!DEBUG_INFO_EXPRESSION_TYPE("@NonNull() kotlin.String")!>p<!>.length // <------ null check or not?
21+
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String")!>p<!>.length // <------ null check or not?
2222
}
2323
}
2424

‎compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/unstableEnhancedNullability.fir.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ FILE: C.kt
77
public final fun g(): R|kotlin/Unit| {
88
(this@R|/C|.R|/C.r|() as R|kotlin/String|)
99
{
10-
lval <iterator>: R|kotlin/collections/Iterator<@EnhancedNullability @R|org/jspecify/annotations/NonNull|() kotlin/String>| = Q|P|.R|/P.f*s|().R|SubstitutionOverride<kotlin/Array.iterator: R|kotlin/collections/Iterator<@EnhancedNullability @R|org/jspecify/annotations/NonNull|() kotlin/String>|>|()
10+
lval <iterator>: R|kotlin/collections/Iterator<kotlin/String>| = Q|P|.R|/P.f*s|().R|SubstitutionOverride<kotlin/Array.iterator: R|kotlin/collections/Iterator<kotlin/String>|>|()
1111
while(R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.hasNext: R|kotlin/Boolean|>|()) {
12-
lval p: R|@R|org/jspecify/annotations/NonNull|() kotlin/String| = R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|@EnhancedNullability @R|org/jspecify/annotations/NonNull|() kotlin/String|>|()
12+
lval p: R|kotlin/String| = R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|kotlin/String|>|()
1313
{
1414
R|<local>/p|.R|kotlin/String.length|
1515
}

‎compiler/testData/ir/irText/fakeOverrides/annotations/typeArgumentAnnotationOverride.fir.ir.txt‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -183,47 +183,47 @@ FILE fqName:<root> fileName:/1.kt
183183
TYPE_OP type=@[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String> origin=IMPLICIT_NOTNULL typeOperand=@[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String>
184184
CALL 'public open fun toSet (elements: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String>?): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String>? declared in <root>.A' type=@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String>? origin=null
185185
ARG <this>: GET_VAR 'a: <root>.A declared in <root>.test' type=<root>.A origin=null
186-
ARG elements: CALL 'public final fun mutableListOf <T> (vararg elements: T of kotlin.collections.mutableListOf): kotlin.collections.MutableList<T of kotlin.collections.mutableListOf> declared in kotlin.collections' type=kotlin.collections.MutableList<kotlin.String> origin=null
187-
TYPE_ARG T: kotlin.String
188-
ARG elements: VARARG type=kotlin.Array<out kotlin.String> varargElementType=kotlin.String
186+
ARG elements: CALL 'public final fun mutableListOf <T> (vararg elements: T of kotlin.collections.mutableListOf): kotlin.collections.MutableList<T of kotlin.collections.mutableListOf> declared in kotlin.collections' type=kotlin.collections.MutableList<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String> origin=null
187+
TYPE_ARG T: @[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String
188+
ARG elements: VARARG type=kotlin.Array<out @[EnhancedNullability] kotlin.String> varargElementType=@[EnhancedNullability] kotlin.String
189189
CONST String type=kotlin.String value="1"
190190
VAR name:k2 type:kotlin.collections.Set<kotlin.String> [val]
191191
TYPE_OP type=@[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String> origin=IMPLICIT_NOTNULL typeOperand=@[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String>
192192
CALL 'public open fun toSet (elements: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String>?): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String>? declared in <root>.B' type=@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String>? origin=null
193193
ARG <this>: GET_VAR 'b: <root>.B declared in <root>.test' type=<root>.B origin=null
194-
ARG elements: CALL 'public final fun mutableListOf <T> (vararg elements: T of kotlin.collections.mutableListOf): kotlin.collections.MutableList<T of kotlin.collections.mutableListOf> declared in kotlin.collections' type=kotlin.collections.MutableList<kotlin.String> origin=null
195-
TYPE_ARG T: kotlin.String
196-
ARG elements: VARARG type=kotlin.Array<out kotlin.String> varargElementType=kotlin.String
194+
ARG elements: CALL 'public final fun mutableListOf <T> (vararg elements: T of kotlin.collections.mutableListOf): kotlin.collections.MutableList<T of kotlin.collections.mutableListOf> declared in kotlin.collections' type=kotlin.collections.MutableList<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String> origin=null
195+
TYPE_ARG T: @[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String
196+
ARG elements: VARARG type=kotlin.Array<out @[EnhancedNullability] kotlin.String> varargElementType=@[EnhancedNullability] kotlin.String
197197
CONST String type=kotlin.String value="1"
198198
VAR name:k3 type:kotlin.collections.Set<kotlin.String> [val]
199199
TYPE_OP type=@[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String> origin=IMPLICIT_NOTNULL typeOperand=@[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String>
200200
CALL 'public open fun toSet (elements: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String>?): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String>? declared in <root>.C' type=@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String>? origin=null
201201
ARG <this>: GET_VAR 'c: <root>.C declared in <root>.test' type=<root>.C origin=null
202-
ARG elements: CALL 'public final fun mutableListOf <T> (vararg elements: T of kotlin.collections.mutableListOf): kotlin.collections.MutableList<T of kotlin.collections.mutableListOf> declared in kotlin.collections' type=kotlin.collections.MutableList<kotlin.String> origin=null
203-
TYPE_ARG T: kotlin.String
204-
ARG elements: VARARG type=kotlin.Array<out kotlin.String> varargElementType=kotlin.String
202+
ARG elements: CALL 'public final fun mutableListOf <T> (vararg elements: T of kotlin.collections.mutableListOf): kotlin.collections.MutableList<T of kotlin.collections.mutableListOf> declared in kotlin.collections' type=kotlin.collections.MutableList<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String> origin=null
203+
TYPE_ARG T: @[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String
204+
ARG elements: VARARG type=kotlin.Array<out @[EnhancedNullability] kotlin.String> varargElementType=@[EnhancedNullability] kotlin.String
205205
CONST String type=kotlin.String value="1"
206206
VAR name:k4 type:kotlin.collections.Set<kotlin.String> [val]
207207
TYPE_OP type=@[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String> origin=IMPLICIT_NOTNULL typeOperand=@[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String>
208208
CALL 'public open fun toSet (elements: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String>?): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String>? declared in <root>.D' type=@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String>? origin=null
209209
ARG <this>: GET_VAR 'd: <root>.D declared in <root>.test' type=<root>.D origin=null
210-
ARG elements: CALL 'public final fun mutableListOf <T> (vararg elements: T of kotlin.collections.mutableListOf): kotlin.collections.MutableList<T of kotlin.collections.mutableListOf> declared in kotlin.collections' type=kotlin.collections.MutableList<kotlin.String> origin=null
211-
TYPE_ARG T: kotlin.String
212-
ARG elements: VARARG type=kotlin.Array<out kotlin.String> varargElementType=kotlin.String
210+
ARG elements: CALL 'public final fun mutableListOf <T> (vararg elements: T of kotlin.collections.mutableListOf): kotlin.collections.MutableList<T of kotlin.collections.mutableListOf> declared in kotlin.collections' type=kotlin.collections.MutableList<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String> origin=null
211+
TYPE_ARG T: @[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String
212+
ARG elements: VARARG type=kotlin.Array<out @[EnhancedNullability] kotlin.String> varargElementType=@[EnhancedNullability] kotlin.String
213213
CONST String type=kotlin.String value="1"
214214
VAR name:k5 type:kotlin.collections.Set<kotlin.String> [val]
215215
TYPE_OP type=@[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String> origin=IMPLICIT_NOTNULL typeOperand=@[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String>
216216
CALL 'public open fun toSet (elements: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String>?): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String>? declared in <root>.E' type=@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String>? origin=null
217217
ARG <this>: GET_VAR 'e: <root>.E declared in <root>.test' type=<root>.E origin=null
218-
ARG elements: CALL 'public final fun mutableListOf <T> (vararg elements: T of kotlin.collections.mutableListOf): kotlin.collections.MutableList<T of kotlin.collections.mutableListOf> declared in kotlin.collections' type=kotlin.collections.MutableList<kotlin.String> origin=null
219-
TYPE_ARG T: kotlin.String
220-
ARG elements: VARARG type=kotlin.Array<out kotlin.String> varargElementType=kotlin.String
218+
ARG elements: CALL 'public final fun mutableListOf <T> (vararg elements: T of kotlin.collections.mutableListOf): kotlin.collections.MutableList<T of kotlin.collections.mutableListOf> declared in kotlin.collections' type=kotlin.collections.MutableList<@[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String> origin=null
219+
TYPE_ARG T: @[EnhancedNullability] @[NotNull(value = <null>)] kotlin.String
220+
ARG elements: VARARG type=kotlin.Array<out @[EnhancedNullability] kotlin.String> varargElementType=@[EnhancedNullability] kotlin.String
221221
CONST String type=kotlin.String value="1"
222222
VAR name:k6 type:kotlin.collections.Set<kotlin.String> [val]
223223
TYPE_OP type=@[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.String> origin=IMPLICIT_NOTNULL typeOperand=@[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.String>
224224
CALL 'public open fun toSet (elements: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableCollection<@[EnhancedNullability] kotlin.String>?): @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.String>? declared in <root>.F' type=@[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableSet<@[EnhancedNullability] kotlin.String>? origin=null
225225
ARG <this>: GET_VAR 'f: <root>.F declared in <root>.test' type=<root>.F origin=null
226-
ARG elements: CALL 'public final fun mutableListOf <T> (vararg elements: T of kotlin.collections.mutableListOf): kotlin.collections.MutableList<T of kotlin.collections.mutableListOf> declared in kotlin.collections' type=kotlin.collections.MutableList<kotlin.String> origin=null
227-
TYPE_ARG T: kotlin.String
228-
ARG elements: VARARG type=kotlin.Array<out kotlin.String> varargElementType=kotlin.String
226+
ARG elements: CALL 'public final fun mutableListOf <T> (vararg elements: T of kotlin.collections.mutableListOf): kotlin.collections.MutableList<T of kotlin.collections.mutableListOf> declared in kotlin.collections' type=kotlin.collections.MutableList<@[EnhancedNullability] kotlin.String> origin=null
227+
TYPE_ARG T: @[EnhancedNullability] kotlin.String
228+
ARG elements: VARARG type=kotlin.Array<out @[EnhancedNullability] kotlin.String> varargElementType=@[EnhancedNullability] kotlin.String
229229
CONST String type=kotlin.String value="1"

0 commit comments

Comments
 (0)