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

[JS IR] Nullify body of declaration on it shouldn't be loaded

Browse Source
This commit is contained in:
Roman Artemev
2021-09-28 18:21:11 +03:00
committed by TeamCityServer
parent 4bd6e8a034
commit 2ca74174d3
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/serialization/CarrierDeserializer.kt
+1 -1
View File
@@ -54,7 +54,7 @@ class CarrierDeserializer(
private val expressionBodyCache = mutableMapOf<Int, IrExpressionBody>() private val expressionBodyCache = mutableMapOf<Int, IrExpressionBody>()
private fun deserializeExpressionBody(index: Int): IrExpressionBody = expressionBodyCache.getOrPut(index) { private fun deserializeExpressionBody(index: Int): IrExpressionBody = expressionBodyCache.getOrPut(index) {
declarationDeserializer.deserializeExpressionBody(index).also { declarationDeserializer.deserializeExpressionBody(index)!!.also {
injectCarriers(it, index) injectCarriers(it, index)
} }
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrDeclarationDeserializer.kt
+13 -18
View File
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.ir.IrElement
import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.declarations.impl.IrVariableImpl import org.jetbrains.kotlin.ir.declarations.impl.IrVariableImpl
import org.jetbrains.kotlin.ir.expressions.* import org.jetbrains.kotlin.ir.expressions.*
import org.jetbrains.kotlin.ir.expressions.impl.IrErrorExpressionImpl import org.jetbrains.kotlin.ir.expressions.impl.IrCompositeImpl
import org.jetbrains.kotlin.ir.symbols.* import org.jetbrains.kotlin.ir.symbols.*
import org.jetbrains.kotlin.ir.symbols.impl.IrPublicSymbolBase import org.jetbrains.kotlin.ir.symbols.impl.IrPublicSymbolBase
import org.jetbrains.kotlin.ir.symbols.impl.IrTypeParameterPublicSymbolImpl import org.jetbrains.kotlin.ir.symbols.impl.IrTypeParameterPublicSymbolImpl
@@ -305,6 +305,7 @@ class IrDeclarationDeserializer(
).apply { ).apply {
if (proto.hasDefaultValue()) if (proto.hasDefaultValue())
defaultValue = deserializeExpressionBody(proto.defaultValue) defaultValue = deserializeExpressionBody(proto.defaultValue)
?: irFactory.createExpressionBody(IrCompositeImpl(startOffset, endOffset, type))
} }
} }
@@ -495,27 +496,21 @@ class IrDeclarationDeserializer(
return ProtoExpression.parseFrom(readBody(index), extensionRegistry) return ProtoExpression.parseFrom(readBody(index), extensionRegistry)
} }
fun deserializeExpressionBody(index: Int): IrExpressionBody { fun deserializeExpressionBody(index: Int): IrExpressionBody? {
return irFactory.createExpressionBody( return if (deserializeBodies) {
if (deserializeBodies) { val bodyData = loadExpressionBodyProto(index)
val bodyData = loadExpressionBodyProto(index) irFactory.createExpressionBody(bodyDeserializer.deserializeExpression(bodyData))
bodyDeserializer.deserializeExpression(bodyData) } else {
} else { null
val errorType = IrErrorTypeImpl(null, emptyList(), Variance.INVARIANT) }
IrErrorExpressionImpl(-1, -1, errorType, "Expression body is not deserialized yet")
}
)
} }
fun deserializeStatementBody(index: Int): IrElement { fun deserializeStatementBody(index: Int): IrElement? {
return if (deserializeBodies) { return if (deserializeBodies) {
val bodyData = loadStatementBodyProto(index) val bodyData = loadStatementBodyProto(index)
bodyDeserializer.deserializeStatement(bodyData) bodyDeserializer.deserializeStatement(bodyData)
} else { } else {
val errorType = IrErrorTypeImpl(null, emptyList(), Variance.INVARIANT) null
irFactory.createBlockBody(
-1, -1, listOf(IrErrorExpressionImpl(-1, -1, errorType, "Statement body is not deserialized yet"))
)
} }
} }
@@ -539,7 +534,7 @@ class IrDeclarationDeserializer(
if (proto.hasExtensionReceiver()) deserializeIrValueParameter(proto.extensionReceiver, -1) if (proto.hasExtensionReceiver()) deserializeIrValueParameter(proto.extensionReceiver, -1)
else null else null
body = body =
if (proto.hasBody()) deserializeStatementBody(proto.body) as IrBody if (proto.hasBody()) deserializeStatementBody(proto.body) as IrBody?
else null else null
} }
} }
@@ -615,7 +610,7 @@ class IrDeclarationDeserializer(
private fun deserializeIrAnonymousInit(proto: ProtoAnonymousInit): IrAnonymousInitializer = private fun deserializeIrAnonymousInit(proto: ProtoAnonymousInit): IrAnonymousInitializer =
withDeserializedIrDeclarationBase(proto.base) { symbol, _, startOffset, endOffset, origin, _ -> withDeserializedIrDeclarationBase(proto.base) { symbol, _, startOffset, endOffset, origin, _ ->
irFactory.createAnonymousInitializer(startOffset, endOffset, origin, checkSymbolType(symbol)).apply { irFactory.createAnonymousInitializer(startOffset, endOffset, origin, checkSymbolType(symbol)).apply {
body = deserializeStatementBody(proto.body) as IrBlockBody body = deserializeStatementBody(proto.body) as IrBlockBody? ?: irFactory.createBlockBody(startOffset, endOffset)
} }
} }