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

IR: create IrExpressionBody via IrFactory

Browse Source
This commit is contained in:
Alexander Udalov
2020-07-14 19:39:39 +02:00
parent d1dc938a5d
commit 9ad4a754ce
31 changed files with 110 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt
+3 -3
View File
@@ -1014,7 +1014,7 @@ abstract class IrFileDeserializer(
flags.isNoInline
).apply {
if (proto.hasDefaultValue())
defaultValue = IrExpressionBodyImpl(deserializeExpressionBody(proto.defaultValue))
defaultValue = irFactory.createExpressionBody(deserializeExpressionBody(proto.defaultValue))
(descriptor as? WrappedValueParameterDescriptor)?.bind(this)
(descriptor as? WrappedReceiverParameterDescriptor)?.bind(this)
@@ -1239,7 +1239,7 @@ abstract class IrFileDeserializer(
if (proto.hasCorrespondingClass())
correspondingClass = deserializeIrClass(proto.correspondingClass)
if (proto.hasInitializer())
initializerExpression = IrExpressionBodyImpl(deserializeExpressionBody(proto.initializer))
initializerExpression = irFactory.createExpressionBody(deserializeExpressionBody(proto.initializer))
(descriptor as? WrappedEnumEntryDescriptor)?.bind(this)
}
@@ -1297,7 +1297,7 @@ abstract class IrFileDeserializer(
}.usingParent {
if (proto.hasInitializer()) {
withInitializerGuard(isPrivateProperty) {
initializer = IrExpressionBodyImpl(deserializeExpressionBody(proto.initializer))
initializer = irFactory.createExpressionBody(deserializeExpressionBody(proto.initializer))
}
}