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

FIR2IR: support reading of isNewPlaceForBodyGeneration in lazy class

Browse Source
This commit is contained in:
Mikhail Glukhikh
2021-11-25 16:28:19 +03:00
parent c652cd2245
commit 4a8f00bc7c
15 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/JvmIrUtils.kt
+6 -2
View File
@@ -33,6 +33,7 @@ import org.jetbrains.kotlin.ir.builders.irExprBody
import org.jetbrains.kotlin.ir.builders.irGet
import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.declarations.lazy.IrLazyClass
import org.jetbrains.kotlin.ir.declarations.lazy.IrMaybeDeserializedClass
import org.jetbrains.kotlin.ir.expressions.*
import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
import org.jetbrains.kotlin.ir.expressions.impl.IrClassReferenceImpl
@@ -82,8 +83,11 @@ fun IrSimpleFunction.isCompiledToJvmDefault(jvmDefaultMode: JvmDefaultMode): Boo
}
if (origin == IrDeclarationOrigin.IR_EXTERNAL_JAVA_DECLARATION_STUB) return false
if (hasJvmDefault()) return true
(parentAsClass as? IrLazyClass)?.classProto?.let {
return JvmProtoBufUtil.isNewPlaceForBodyGeneration(it)
when (val klass = parentAsClass) {
is IrLazyClass -> klass.classProto?.let {
return JvmProtoBufUtil.isNewPlaceForBodyGeneration(it)
}
is IrMaybeDeserializedClass -> return klass.isNewPlaceForBodyGeneration
}
return jvmDefaultMode.forAllMethodsWithBody
}
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrMaybeDeserializedClass.kt
+2
View File
@@ -9,4 +9,6 @@ import org.jetbrains.kotlin.ir.declarations.IrDeclaration
interface IrMaybeDeserializedClass : IrDeclaration {
val moduleName: String?
val isNewPlaceForBodyGeneration: Boolean
}