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

JVM: update test data after enabling IR fake override builder

Browse Source 
#KT-61514 Fixed
This commit is contained in:
Alexander Udalov
2024-01-09 16:08:15 +01:00
committed by Space Team
parent f98a22e8e4
commit dfd9aabf8e
83 changed files with 244 additions and 1006 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/ir/irText/fakeOverrides/fakeOverrideOfRawJavaCollection.fir.ir.txt
Vendored
+2 -2
View File
@@ -150,8 +150,8 @@ FILE fqName:<root> fileName:/1.kt
PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val]
overridden:
public open size: kotlin.Int
FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:OPEN <> ($this:java.util.ArrayList<@[FlexibleNullability] kotlin.Any?>) returnType:kotlin.Int [fake_override]
FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:OPEN <> ($this:<root>.Java1) returnType:kotlin.Int [fake_override]
correspondingProperty: PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val]
overridden:
public open fun <get-size> (): kotlin.Int declared in <root>.Java1
$this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<@[FlexibleNullability] kotlin.Any?>
$this: VALUE_PARAMETER name:<this> type:<root>.Java1
compiler/testData/ir/irText/fakeOverrides/fakeOverrideOfRawJavaCollection.fir.sig.kt.txt
Vendored
-12
View File
@@ -22,16 +22,12 @@ abstract class E : Java1 {
// CHECK JVM_IR:
// Mangled name: E#addAll(kotlin.collections.Collection<kotlin.Any?>){}kotlin.Boolean
// Mangled name for the signature by IR: addAll(kotlin.collections.Collection<kotlin.Any?>){}kotlin.Boolean
// Mangled name for the signature by Frontend: addAll(kotlin.collections.Collection<kotlin.Any?>{EnhancedNullability}){}kotlin.Boolean
// Public signature: /E.addAll|1853624435708785695[0]
// Public signature debug description: addAll(kotlin.collections.Collection<kotlin.Any?>){}kotlin.Boolean
/* fake */ override fun addAll(p0: Collection<Any?>): Boolean
// CHECK JVM_IR:
// Mangled name: E#addAll(kotlin.Int;kotlin.collections.Collection<kotlin.Any?>){}kotlin.Boolean
// Mangled name for the signature by IR: addAll(kotlin.Int;kotlin.collections.Collection<kotlin.Any?>){}kotlin.Boolean
// Mangled name for the signature by Frontend: addAll(kotlin.Int;kotlin.collections.Collection<kotlin.Any?>{EnhancedNullability}){}kotlin.Boolean
// Public signature: /E.addAll|-92648757594494376[0]
// Public signature debug description: addAll(kotlin.Int;kotlin.collections.Collection<kotlin.Any?>){}kotlin.Boolean
/* fake */ override fun addAll(p0: Int, p1: Collection<Any?>): Boolean
@@ -98,8 +94,6 @@ abstract class E : Java1 {
// CHECK JVM_IR:
// Mangled name: E#iterator(){}kotlin.collections.MutableIterator<kotlin.Any?>
// Mangled name for the signature by IR: iterator(){}kotlin.collections.MutableIterator<kotlin.Any?>
// Mangled name for the signature by Frontend: iterator(){}kotlin.collections.MutableIterator<kotlin.Any?>{EnhancedNullability}
// Public signature: /E.iterator|5172039261324384933[0]
// Public signature debug description: iterator(){}kotlin.collections.MutableIterator<kotlin.Any?>
/* fake */ override operator fun iterator(): MutableIterator<Any?>
@@ -112,16 +106,12 @@ abstract class E : Java1 {
// CHECK JVM_IR:
// Mangled name: E#listIterator(){}kotlin.collections.MutableListIterator<kotlin.Any?>
// Mangled name for the signature by IR: listIterator(){}kotlin.collections.MutableListIterator<kotlin.Any?>
// Mangled name for the signature by Frontend: listIterator(){}kotlin.collections.MutableListIterator<kotlin.Any?>{EnhancedNullability}
// Public signature: /E.listIterator|-1621664620524293242[0]
// Public signature debug description: listIterator(){}kotlin.collections.MutableListIterator<kotlin.Any?>
/* fake */ override fun listIterator(): MutableListIterator<Any?>
// CHECK JVM_IR:
// Mangled name: E#listIterator(kotlin.Int){}kotlin.collections.MutableListIterator<kotlin.Any?>
// Mangled name for the signature by IR: listIterator(kotlin.Int){}kotlin.collections.MutableListIterator<kotlin.Any?>
// Mangled name for the signature by Frontend: listIterator(kotlin.Int){}kotlin.collections.MutableListIterator<kotlin.Any?>{EnhancedNullability}
// Public signature: /E.listIterator|2617555913478172101[0]
// Public signature debug description: listIterator(kotlin.Int){}kotlin.collections.MutableListIterator<kotlin.Any?>
/* fake */ override fun listIterator(p0: Int): MutableListIterator<Any?>
@@ -164,8 +154,6 @@ abstract class E : Java1 {
// CHECK JVM_IR:
// Mangled name: E#subList(kotlin.Int;kotlin.Int){}kotlin.collections.MutableList<kotlin.Any?>
// Mangled name for the signature by IR: subList(kotlin.Int;kotlin.Int){}kotlin.collections.MutableList<kotlin.Any?>
// Mangled name for the signature by Frontend: subList(kotlin.Int;kotlin.Int){}kotlin.collections.MutableList<kotlin.Any?>{EnhancedNullability}
// Public signature: /E.subList|5649745263147539891[0]
// Public signature debug description: subList(kotlin.Int;kotlin.Int){}kotlin.collections.MutableList<kotlin.Any?>
/* fake */ override fun subList(p0: Int, p1: Int): MutableList<Any?>
compiler/testData/ir/irText/fakeOverrides/intersectionWithMappedSignature.fir.ir.txt
Vendored
+2 -2
View File
@@ -99,7 +99,7 @@ FILE fqName:<root> fileName:/1.kt
public open fun listIterator (p0: kotlin.Int): @[EnhancedNullability] kotlin.collections.MutableListIterator<@[EnhancedNullability] E of java.util.ArrayList> declared in java.util.ArrayList
$this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<kotlin.Int>
VALUE_PARAMETER name:p0 index:0 type:kotlin.Int
FUN FAKE_OVERRIDE name:parallelStream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection<kotlin.Int>) returnType:@[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] @[FlexibleNullability] kotlin.Int?> [fake_override]
FUN FAKE_OVERRIDE name:parallelStream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection<kotlin.Int>) returnType:@[EnhancedNullability] java.util.stream.Stream<@[FlexibleNullability] @[EnhancedNullability] kotlin.Int?> [fake_override]
overridden:
public open fun parallelStream (): @[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] @[FlexibleNullability] E of java.util.ArrayList?> declared in java.util.ArrayList
$this: VALUE_PARAMETER name:<this> type:kotlin.collections.Collection<kotlin.Int>
@@ -155,7 +155,7 @@ FILE fqName:<root> fileName:/1.kt
overridden:
public open fun spliterator (): @[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] E of java.util.ArrayList?> declared in java.util.ArrayList
$this: VALUE_PARAMETER name:<this> type:java.util.ArrayList<kotlin.Int>
FUN FAKE_OVERRIDE name:stream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection<kotlin.Int>) returnType:@[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] @[FlexibleNullability] kotlin.Int?> [fake_override]
FUN FAKE_OVERRIDE name:stream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection<kotlin.Int>) returnType:@[EnhancedNullability] java.util.stream.Stream<@[FlexibleNullability] @[EnhancedNullability] kotlin.Int?> [fake_override]
overridden:
public open fun stream (): @[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] @[FlexibleNullability] E of java.util.ArrayList?> declared in java.util.ArrayList
$this: VALUE_PARAMETER name:<this> type:kotlin.collections.Collection<kotlin.Int>
compiler/testData/ir/irText/fakeOverrides/intersectionWithMappedSignature.fir.sig.kt.txt
Vendored
-4
View File
@@ -124,8 +124,6 @@ abstract class B : ArrayList<Int>, Java1 {
// CHECK JVM_IR:
// Mangled name: B#parallelStream(){}java.util.stream.Stream<kotlin.Int?{EnhancedNullability}>{EnhancedNullability}
// Mangled name for the signature by IR: parallelStream(){}java.util.stream.Stream<kotlin.Int?{EnhancedNullability}>{EnhancedNullability}
// Mangled name for the signature by Frontend: parallelStream(){}java.util.stream.Stream<kotlin.Int?>{EnhancedNullability}
// Public signature: /B.parallelStream|-8395108522211591010[0]
// Public signature debug description: parallelStream(){}java.util.stream.Stream<kotlin.Int?{EnhancedNullability}>{EnhancedNullability}
/* fake */ override fun parallelStream(): @EnhancedNullability Stream<@EnhancedNullability Int?>
@@ -192,8 +190,6 @@ abstract class B : ArrayList<Int>, Java1 {
// CHECK JVM_IR:
// Mangled name: B#stream(){}java.util.stream.Stream<kotlin.Int?{EnhancedNullability}>{EnhancedNullability}
// Mangled name for the signature by IR: stream(){}java.util.stream.Stream<kotlin.Int?{EnhancedNullability}>{EnhancedNullability}
// Mangled name for the signature by Frontend: stream(){}java.util.stream.Stream<kotlin.Int?>{EnhancedNullability}
// Public signature: /B.stream|1565529915260485250[0]
// Public signature debug description: stream(){}java.util.stream.Stream<kotlin.Int?{EnhancedNullability}>{EnhancedNullability}
/* fake */ override fun stream(): @EnhancedNullability Stream<@EnhancedNullability Int?>
compiler/testData/ir/irText/fakeOverrides/setterVisibliityWithJava.__JavaChild.fir.ir.txt
Vendored
+6
View File
@@ -38,6 +38,12 @@ CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:JavaChild modality:OPEN visib
overridden:
public final fun <get-c> (): kotlin.Int declared in <root>.KotlinBase
$this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.JavaChild
FUN FAKE_OVERRIDE name:<set-c> visibility:private modality:FINAL <> ($this:<root>.JavaChild, value:kotlin.Int) returnType:kotlin.Unit [fake_override]
correspondingProperty: PROPERTY FAKE_OVERRIDE name:c visibility:public modality:FINAL [fake_override,var]
overridden:
private final fun <set-c> (<set-?>: kotlin.Int): kotlin.Unit declared in <root>.KotlinBase
$this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.JavaChild
VALUE_PARAMETER name:value index:0 type:kotlin.Int
PROPERTY FAKE_OVERRIDE name:d visibility:public modality:FINAL [fake_override,var]
overridden:
public final d: kotlin.Int [var]
compiler/testData/ir/irText/fakeOverrides/setterVisibliityWithJava.fir.ir.txt
Vendored
+16 -16
View File
@@ -21,53 +21,53 @@ FILE fqName:<root> fileName:/1.kt
PROPERTY FAKE_OVERRIDE name:a visibility:public modality:FINAL [fake_override,var]
overridden:
public final a: kotlin.Int
FUN FAKE_OVERRIDE name:<get-a> visibility:public modality:FINAL <> ($this:<root>.KotlinBase) returnType:kotlin.Int [fake_override]
FUN FAKE_OVERRIDE name:<get-a> visibility:public modality:FINAL <> ($this:<root>.JavaChild) returnType:kotlin.Int [fake_override]
correspondingProperty: PROPERTY FAKE_OVERRIDE name:a visibility:public modality:FINAL [fake_override,var]
overridden:
public final fun <get-a> (): kotlin.Int declared in <root>.JavaChild
$this: VALUE_PARAMETER name:<this> type:<root>.KotlinBase
FUN FAKE_OVERRIDE name:<set-a> visibility:public modality:FINAL <> ($this:<root>.KotlinBase, <set-?>:kotlin.Int) returnType:kotlin.Unit [fake_override]
$this: VALUE_PARAMETER name:<this> type:<root>.JavaChild
FUN FAKE_OVERRIDE name:<set-a> visibility:public modality:FINAL <> ($this:<root>.JavaChild, <set-?>:kotlin.Int) returnType:kotlin.Unit [fake_override]
correspondingProperty: PROPERTY FAKE_OVERRIDE name:a visibility:public modality:FINAL [fake_override,var]
overridden:
public final fun <set-a> (<set-?>: kotlin.Int): kotlin.Unit declared in <root>.JavaChild
$this: VALUE_PARAMETER name:<this> type:<root>.KotlinBase
$this: VALUE_PARAMETER name:<this> type:<root>.JavaChild
VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int
PROPERTY FAKE_OVERRIDE name:b visibility:public modality:FINAL [fake_override,var]
overridden:
public final b: kotlin.Int
FUN FAKE_OVERRIDE name:<get-b> visibility:public modality:FINAL <> ($this:<root>.KotlinBase) returnType:kotlin.Int [fake_override]
FUN FAKE_OVERRIDE name:<get-b> visibility:public modality:FINAL <> ($this:<root>.JavaChild) returnType:kotlin.Int [fake_override]
correspondingProperty: PROPERTY FAKE_OVERRIDE name:b visibility:public modality:FINAL [fake_override,var]
overridden:
public final fun <get-b> (): kotlin.Int declared in <root>.JavaChild
$this: VALUE_PARAMETER name:<this> type:<root>.KotlinBase
FUN FAKE_OVERRIDE name:<set-b> visibility:protected modality:FINAL <> ($this:<root>.KotlinBase, <set-?>:kotlin.Int) returnType:kotlin.Unit [fake_override]
$this: VALUE_PARAMETER name:<this> type:<root>.JavaChild
FUN FAKE_OVERRIDE name:<set-b> visibility:protected modality:FINAL <> ($this:<root>.JavaChild, value:kotlin.Int) returnType:kotlin.Unit [fake_override]
correspondingProperty: PROPERTY FAKE_OVERRIDE name:b visibility:public modality:FINAL [fake_override,var]
overridden:
protected final fun <set-b> (value: kotlin.Int): kotlin.Unit declared in <root>.JavaChild
$this: VALUE_PARAMETER name:<this> type:<root>.KotlinBase
VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int
$this: VALUE_PARAMETER name:<this> type:<root>.JavaChild
VALUE_PARAMETER name:value index:0 type:kotlin.Int
PROPERTY FAKE_OVERRIDE name:c visibility:public modality:FINAL [fake_override,var]
overridden:
public final c: kotlin.Int
FUN FAKE_OVERRIDE name:<get-c> visibility:public modality:FINAL <> ($this:<root>.KotlinBase) returnType:kotlin.Int [fake_override]
FUN FAKE_OVERRIDE name:<get-c> visibility:public modality:FINAL <> ($this:<root>.JavaChild) returnType:kotlin.Int [fake_override]
correspondingProperty: PROPERTY FAKE_OVERRIDE name:c visibility:public modality:FINAL [fake_override,var]
overridden:
public final fun <get-c> (): kotlin.Int declared in <root>.JavaChild
$this: VALUE_PARAMETER name:<this> type:<root>.KotlinBase
$this: VALUE_PARAMETER name:<this> type:<root>.JavaChild
PROPERTY FAKE_OVERRIDE name:d visibility:public modality:FINAL [fake_override,var]
overridden:
public final d: kotlin.Int
FUN FAKE_OVERRIDE name:<get-d> visibility:public modality:FINAL <> ($this:<root>.KotlinBase) returnType:kotlin.Int [fake_override]
FUN FAKE_OVERRIDE name:<get-d> visibility:public modality:FINAL <> ($this:<root>.JavaChild) returnType:kotlin.Int [fake_override]
correspondingProperty: PROPERTY FAKE_OVERRIDE name:d visibility:public modality:FINAL [fake_override,var]
overridden:
public final fun <get-d> (): kotlin.Int declared in <root>.JavaChild
$this: VALUE_PARAMETER name:<this> type:<root>.KotlinBase
FUN FAKE_OVERRIDE name:<set-d> visibility:internal modality:FINAL <> ($this:<root>.KotlinBase, <set-?>:kotlin.Int) returnType:kotlin.Unit [fake_override]
$this: VALUE_PARAMETER name:<this> type:<root>.JavaChild
FUN FAKE_OVERRIDE name:<set-d> visibility:internal modality:FINAL <> ($this:<root>.JavaChild, value:kotlin.Int) returnType:kotlin.Unit [fake_override]
correspondingProperty: PROPERTY FAKE_OVERRIDE name:d visibility:public modality:FINAL [fake_override,var]
overridden:
internal final fun <set-d> (value: kotlin.Int): kotlin.Unit declared in <root>.JavaChild
$this: VALUE_PARAMETER name:<this> type:<root>.KotlinBase
VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int
$this: VALUE_PARAMETER name:<this> type:<root>.JavaChild
VALUE_PARAMETER name:value index:0 type:kotlin.Int
PROPERTY FAKE_OVERRIDE name:e visibility:public modality:OPEN [fake_override,var]
overridden:
public open e: kotlin.Int