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

IR: IrConstructorCall: fixes after rebase

Browse Source
This commit is contained in:
Dmitry Petrov
2019-04-25 16:11:29 +03:00
parent 7f423bd841
commit 865e0cc080
21 changed files with 287 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/CallableReferenceLowering.kt
+1 -1
View File
@@ -58,7 +58,7 @@ import org.jetbrains.org.objectweb.asm.Type
//Hack implementation to support CR java types in lower
class CrIrType(val type: Type) : IrType {
override val annotations: List<IrCall> = emptyList()
override val annotations: List<IrConstructorCall> = emptyList()
override fun equals(other: Any?): Boolean =
other is CrIrType && type == other.type
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyField.kt
+2 -1
View File
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
import org.jetbrains.kotlin.ir.declarations.IrField
import org.jetbrains.kotlin.ir.declarations.IrProperty
import org.jetbrains.kotlin.ir.expressions.IrCall
import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
import org.jetbrains.kotlin.ir.expressions.IrExpressionBody
import org.jetbrains.kotlin.ir.expressions.impl.IrExpressionBodyImpl
import org.jetbrains.kotlin.ir.symbols.IrFieldSymbol
@@ -61,7 +62,7 @@ class IrLazyField(
symbol.bind(this)
}
override val annotations: MutableList<IrCall> = mutableListOf()
override val annotations: MutableList<IrConstructorCall> = mutableListOf()
override val descriptor: PropertyDescriptor = symbol.descriptor