FIR. Refactor smart-cast representation in FIR tree

Make smart-casts non-transparent expression without delegation
to underlying FirQualifiedAccessExpression, as children delegation in
fir tree has unclear semantics
Remove two different kinds of tree nodes for smart-casts
This commit is contained in:
Simon Ogorodnik
2022-08-02 00:49:24 +02:00
committed by teamcity
parent bc9db58b3c
commit 513af2dfbc
154 changed files with 9573 additions and 9320 deletions
@@ -1,52 +0,0 @@
FILE fqName:<root> fileName:/JCTreeUser.kt
CLASS CLASS name:Owner modality:FINAL visibility:public superTypes:[kotlin.Any]
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Owner<T of <root>.Owner>
TYPE_PARAMETER name:T index:0 variance:out superTypes:[<root>.JCTree] reified:false
CONSTRUCTOR visibility:public <> (tree:T of <root>.Owner) returnType:<root>.Owner<T of <root>.Owner> [primary]
VALUE_PARAMETER name:tree index:0 type:T of <root>.Owner
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Owner modality:FINAL visibility:public superTypes:[kotlin.Any]'
PROPERTY name:tree visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:tree type:T of <root>.Owner visibility:private [final]
EXPRESSION_BODY
GET_VAR 'tree: T of <root>.Owner declared in <root>.Owner.<init>' type=T of <root>.Owner origin=INITIALIZE_PROPERTY_FROM_PARAMETER
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-tree> visibility:public modality:FINAL <> ($this:<root>.Owner<T of <root>.Owner>) returnType:T of <root>.Owner
correspondingProperty: PROPERTY name:tree visibility:public modality:FINAL [val]
$this: VALUE_PARAMETER name:<this> type:<root>.Owner<T of <root>.Owner>
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun <get-tree> (): T of <root>.Owner declared in <root>.Owner'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:tree type:T of <root>.Owner visibility:private [final]' type=T of <root>.Owner origin=null
receiver: GET_VAR '<this>: <root>.Owner<T of <root>.Owner> declared in <root>.Owner.<get-tree>' type=<root>.Owner<T of <root>.Owner> origin=null
PROPERTY name:foo visibility:public modality:FINAL [val]
FUN name:<get-foo> visibility:public modality:FINAL <> ($this:<root>.Owner<T of <root>.Owner>) returnType:kotlin.String
correspondingProperty: PROPERTY name:foo visibility:public modality:FINAL [val]
$this: VALUE_PARAMETER name:<this> type:<root>.Owner<T of <root>.Owner>
BLOCK_BODY
VAR name:tree type:<root>.JCTree [var]
CALL 'public final fun <get-tree> (): T of <root>.Owner declared in <root>.Owner' type=T of <root>.Owner origin=GET_PROPERTY
$this: GET_VAR '<this>: <root>.Owner<T of <root>.Owner> declared in <root>.Owner.<get-foo>' type=<root>.Owner<T of <root>.Owner> origin=null
WHEN type=kotlin.Unit origin=IF
BRANCH
if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=<root>.JCTree.JCTypeApply
GET_VAR 'var tree: <root>.JCTree [var] declared in <root>.Owner.<get-foo>' type=<root>.JCTree origin=null
then: RETURN type=kotlin.Nothing from='public final fun <get-foo> (): kotlin.String declared in <root>.Owner'
TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:clazz type:@[FlexibleNullability] kotlin.String? visibility:public' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY
receiver: TYPE_OP type=<root>.JCTree.JCTypeApply origin=IMPLICIT_CAST typeOperand=<root>.JCTree.JCTypeApply
GET_VAR 'var tree: <root>.JCTree [var] declared in <root>.Owner.<get-foo>' type=<root>.JCTree origin=null
RETURN type=kotlin.Nothing from='public final fun <get-foo> (): kotlin.String declared in <root>.Owner'
CONST String type=kotlin.String value=""
FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
overridden:
public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
VALUE_PARAMETER name:other index:0 type:kotlin.Any?
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
overridden:
public open fun hashCode (): kotlin.Int declared in kotlin.Any
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
overridden:
public open fun toString (): kotlin.String declared in kotlin.Any
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
@@ -1,22 +0,0 @@
class Owner<out T : JCTree> {
constructor(tree: T) /* primary */ {
super/*Any*/()
/* <init>() */
}
val tree: T
field = tree
get
val foo: String
get(): String {
var tree: JCTree = <this>.<get-tree>()
when {
tree is JCTypeApply -> return tree /*as JCTypeApply */(super<JCTypeApply>).#clazz /*!! String */
}
return ""
}
}
-53
View File
@@ -1,53 +0,0 @@
FILE fqName:<root> fileName:/JCTreeUser.kt
CLASS CLASS name:Owner modality:FINAL visibility:public superTypes:[kotlin.Any]
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Owner<T of <root>.Owner>
TYPE_PARAMETER name:T index:0 variance:out superTypes:[<root>.JCTree] reified:false
CONSTRUCTOR visibility:public <> (tree:T of <root>.Owner) returnType:<root>.Owner<T of <root>.Owner> [primary]
VALUE_PARAMETER name:tree index:0 type:T of <root>.Owner
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Owner modality:FINAL visibility:public superTypes:[kotlin.Any]'
PROPERTY name:tree visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:tree type:T of <root>.Owner visibility:private [final]
EXPRESSION_BODY
GET_VAR 'tree: T of <root>.Owner declared in <root>.Owner.<init>' type=T of <root>.Owner origin=INITIALIZE_PROPERTY_FROM_PARAMETER
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-tree> visibility:public modality:FINAL <> ($this:<root>.Owner<T of <root>.Owner>) returnType:T of <root>.Owner
correspondingProperty: PROPERTY name:tree visibility:public modality:FINAL [val]
$this: VALUE_PARAMETER name:<this> type:<root>.Owner<T of <root>.Owner>
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun <get-tree> (): T of <root>.Owner declared in <root>.Owner'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:tree type:T of <root>.Owner visibility:private [final]' type=T of <root>.Owner origin=null
receiver: GET_VAR '<this>: <root>.Owner<T of <root>.Owner> declared in <root>.Owner.<get-tree>' type=<root>.Owner<T of <root>.Owner> origin=null
PROPERTY name:foo visibility:public modality:FINAL [val]
FUN name:<get-foo> visibility:public modality:FINAL <> ($this:<root>.Owner<T of <root>.Owner>) returnType:kotlin.String
correspondingProperty: PROPERTY name:foo visibility:public modality:FINAL [val]
$this: VALUE_PARAMETER name:<this> type:<root>.Owner<T of <root>.Owner>
BLOCK_BODY
VAR name:tree type:<root>.JCTree [var]
CALL 'public final fun <get-tree> (): T of <root>.Owner declared in <root>.Owner' type=T of <root>.Owner origin=GET_PROPERTY
$this: GET_VAR '<this>: <root>.Owner<T of <root>.Owner> declared in <root>.Owner.<get-foo>' type=<root>.Owner<T of <root>.Owner> origin=null
WHEN type=kotlin.Unit origin=IF
BRANCH
if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=<root>.JCTree.JCTypeApply
GET_VAR 'var tree: <root>.JCTree [var] declared in <root>.Owner.<get-foo>' type=<root>.JCTree origin=null
then: BLOCK type=kotlin.Unit origin=null
RETURN type=kotlin.Nothing from='public final fun <get-foo> (): kotlin.String declared in <root>.Owner'
TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:clazz type:@[FlexibleNullability] kotlin.String? visibility:public' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY
receiver: TYPE_OP type=<root>.JCTree.JCTypeApply origin=IMPLICIT_CAST typeOperand=<root>.JCTree.JCTypeApply
GET_VAR 'var tree: <root>.JCTree [var] declared in <root>.Owner.<get-foo>' type=<root>.JCTree origin=null
RETURN type=kotlin.Nothing from='public final fun <get-foo> (): kotlin.String declared in <root>.Owner'
CONST String type=kotlin.String value=""
FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
overridden:
public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
VALUE_PARAMETER name:other index:0 type:kotlin.Any?
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
overridden:
public open fun hashCode (): kotlin.Int declared in kotlin.Any
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
overridden:
public open fun toString (): kotlin.String declared in kotlin.Any
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
-25
View File
@@ -1,25 +0,0 @@
// TARGET_BACKEND: JVM
// FILE: JCTree.java
public class JCTree {
public abstract static class JCExpression extends JCTree {
}
public static class JCTypeApply extends JCExpression {
public String clazz = "OK";
}
}
// FILE: JCTreeUser.kt
class Owner<out T : JCTree>(val tree: T) {
val foo: String
get() {
var tree: JCTree = tree
if (tree is JCTree.JCTypeApply) {
return tree.clazz
}
return "";
}
}
-24
View File
@@ -1,24 +0,0 @@
class Owner<out T : JCTree> {
constructor(tree: T) /* primary */ {
super/*Any*/()
/* <init>() */
}
val tree: T
field = tree
get
val foo: String
get(): String {
var tree: JCTree = <this>.<get-tree>()
when {
tree is JCTypeApply -> { // BLOCK
return tree /*as JCTypeApply */(super<JCTypeApply>).#clazz /*!! String */
}
}
return ""
}
}
@@ -0,0 +1,52 @@
FILE fqName:<root> fileName:/Box.kt
CLASS CLASS name:Box modality:FINAL visibility:public superTypes:[kotlin.Any]
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Box<T of <root>.Box>
TYPE_PARAMETER name:T index:0 variance:out superTypes:[<root>.Foo] reified:false
CONSTRUCTOR visibility:public <> (foo:T of <root>.Box) returnType:<root>.Box<T of <root>.Box> [primary]
VALUE_PARAMETER name:foo index:0 type:T of <root>.Box
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Box modality:FINAL visibility:public superTypes:[kotlin.Any]'
PROPERTY name:foo visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:foo type:T of <root>.Box visibility:private [final]
EXPRESSION_BODY
GET_VAR 'foo: T of <root>.Box declared in <root>.Box.<init>' type=T of <root>.Box origin=INITIALIZE_PROPERTY_FROM_PARAMETER
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-foo> visibility:public modality:FINAL <> ($this:<root>.Box<T of <root>.Box>) returnType:T of <root>.Box
correspondingProperty: PROPERTY name:foo visibility:public modality:FINAL [val]
$this: VALUE_PARAMETER name:<this> type:<root>.Box<T of <root>.Box>
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun <get-foo> (): T of <root>.Box declared in <root>.Box'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:foo type:T of <root>.Box visibility:private [final]' type=T of <root>.Box origin=null
receiver: GET_VAR '<this>: <root>.Box<T of <root>.Box> declared in <root>.Box.<get-foo>' type=<root>.Box<T of <root>.Box> origin=null
PROPERTY name:str visibility:public modality:FINAL [val]
FUN name:<get-str> visibility:public modality:FINAL <> ($this:<root>.Box<T of <root>.Box>) returnType:kotlin.String
correspondingProperty: PROPERTY name:str visibility:public modality:FINAL [val]
$this: VALUE_PARAMETER name:<this> type:<root>.Box<T of <root>.Box>
BLOCK_BODY
VAR name:foo type:<root>.Foo [var]
CALL 'public final fun <get-foo> (): T of <root>.Box declared in <root>.Box' type=T of <root>.Box origin=GET_PROPERTY
$this: GET_VAR '<this>: <root>.Box<T of <root>.Box> declared in <root>.Box.<get-str>' type=<root>.Box<T of <root>.Box> origin=null
WHEN type=kotlin.Unit origin=IF
BRANCH
if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=<root>.Foo.Buz
GET_VAR 'var foo: <root>.Foo [var] declared in <root>.Box.<get-str>' type=<root>.Foo origin=null
then: RETURN type=kotlin.Nothing from='public final fun <get-str> (): kotlin.String declared in <root>.Box'
TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:str type:@[FlexibleNullability] kotlin.String? visibility:public' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY
receiver: TYPE_OP type=<root>.Foo.Buz origin=IMPLICIT_CAST typeOperand=<root>.Foo.Buz
GET_VAR 'var foo: <root>.Foo [var] declared in <root>.Box.<get-str>' type=<root>.Foo origin=null
RETURN type=kotlin.Nothing from='public final fun <get-str> (): kotlin.String declared in <root>.Box'
CONST String type=kotlin.String value=""
FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
overridden:
public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
VALUE_PARAMETER name:other index:0 type:kotlin.Any?
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
overridden:
public open fun hashCode (): kotlin.Int declared in kotlin.Any
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
overridden:
public open fun toString (): kotlin.String declared in kotlin.Any
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
@@ -0,0 +1,21 @@
class Box<out T : Foo> {
constructor(foo: T) /* primary */ {
super/*Any*/()
/* <init>() */
}
val foo: T
field = foo
get
val str: String
get(): String {
var foo: Foo = <this>.<get-foo>()
when {
foo is Buz -> return foo /*as Buz */(super<Buz>).#str /*!! String */
}
return ""
}
}
+53
View File
@@ -0,0 +1,53 @@
FILE fqName:<root> fileName:/Box.kt
CLASS CLASS name:Box modality:FINAL visibility:public superTypes:[kotlin.Any]
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Box<T of <root>.Box>
TYPE_PARAMETER name:T index:0 variance:out superTypes:[<root>.Foo] reified:false
CONSTRUCTOR visibility:public <> (foo:T of <root>.Box) returnType:<root>.Box<T of <root>.Box> [primary]
VALUE_PARAMETER name:foo index:0 type:T of <root>.Box
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Box modality:FINAL visibility:public superTypes:[kotlin.Any]'
PROPERTY name:foo visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:foo type:T of <root>.Box visibility:private [final]
EXPRESSION_BODY
GET_VAR 'foo: T of <root>.Box declared in <root>.Box.<init>' type=T of <root>.Box origin=INITIALIZE_PROPERTY_FROM_PARAMETER
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-foo> visibility:public modality:FINAL <> ($this:<root>.Box<T of <root>.Box>) returnType:T of <root>.Box
correspondingProperty: PROPERTY name:foo visibility:public modality:FINAL [val]
$this: VALUE_PARAMETER name:<this> type:<root>.Box<T of <root>.Box>
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun <get-foo> (): T of <root>.Box declared in <root>.Box'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:foo type:T of <root>.Box visibility:private [final]' type=T of <root>.Box origin=null
receiver: GET_VAR '<this>: <root>.Box<T of <root>.Box> declared in <root>.Box.<get-foo>' type=<root>.Box<T of <root>.Box> origin=null
PROPERTY name:str visibility:public modality:FINAL [val]
FUN name:<get-str> visibility:public modality:FINAL <> ($this:<root>.Box<T of <root>.Box>) returnType:kotlin.String
correspondingProperty: PROPERTY name:str visibility:public modality:FINAL [val]
$this: VALUE_PARAMETER name:<this> type:<root>.Box<T of <root>.Box>
BLOCK_BODY
VAR name:foo type:<root>.Foo [var]
CALL 'public final fun <get-foo> (): T of <root>.Box declared in <root>.Box' type=T of <root>.Box origin=GET_PROPERTY
$this: GET_VAR '<this>: <root>.Box<T of <root>.Box> declared in <root>.Box.<get-str>' type=<root>.Box<T of <root>.Box> origin=null
WHEN type=kotlin.Unit origin=IF
BRANCH
if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=<root>.Foo.Buz
GET_VAR 'var foo: <root>.Foo [var] declared in <root>.Box.<get-str>' type=<root>.Foo origin=null
then: BLOCK type=kotlin.Unit origin=null
RETURN type=kotlin.Nothing from='public final fun <get-str> (): kotlin.String declared in <root>.Box'
TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:str type:@[FlexibleNullability] kotlin.String? visibility:public' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY
receiver: TYPE_OP type=<root>.Foo.Buz origin=IMPLICIT_CAST typeOperand=<root>.Foo.Buz
GET_VAR 'var foo: <root>.Foo [var] declared in <root>.Box.<get-str>' type=<root>.Foo origin=null
RETURN type=kotlin.Nothing from='public final fun <get-str> (): kotlin.String declared in <root>.Box'
CONST String type=kotlin.String value=""
FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
overridden:
public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
VALUE_PARAMETER name:other index:0 type:kotlin.Any?
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
overridden:
public open fun hashCode (): kotlin.Int declared in kotlin.Any
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
overridden:
public open fun toString (): kotlin.String declared in kotlin.Any
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
+25
View File
@@ -0,0 +1,25 @@
// TARGET_BACKEND: JVM
// FILE: Foo.java
public class Foo {
public abstract static class Bar extends Foo {
}
public static class Buz extends Bar {
public String str = "OK";
}
}
// FILE: Box.kt
class Box<out T : Foo>(val foo: T) {
val str: String
get() {
var foo: Foo = foo
if (foo is Foo.Buz) {
return foo.str
}
return "";
}
}
+24
View File
@@ -0,0 +1,24 @@
class Box<out T : Foo> {
constructor(foo: T) /* primary */ {
super/*Any*/()
/* <init>() */
}
val foo: T
field = foo
get
val str: String
get(): String {
var foo: Foo = <this>.<get-foo>()
when {
foo is Buz -> { // BLOCK
return foo /*as Buz */(super<Buz>).#str /*!! String */
}
}
return ""
}
}