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

JVM_IR: elide static field initialization to default values

Browse Source
This commit is contained in:
pyos
2019-04-16 12:21:21 +02:00
committed by max-kammerer
parent bcc8802014
commit b1bba70e40
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt
+4 -2
View File
@@ -446,10 +446,12 @@ class ExpressionCodegen(
override fun visitSetField(expression: IrSetField, data: BlockInfo): PromisedValue { override fun visitSetField(expression: IrSetField, data: BlockInfo): PromisedValue {
val expressionValue = expression.value val expressionValue = expression.value
// Do not add redundant field initializers that initialize to default values. // Do not add redundant field initializers that initialize to default values.
val inPrimaryConstructor = irFunction is IrConstructor && irFunction.isPrimary
val inClassInit = irFunction.origin == JvmLoweredDeclarationOrigin.CLASS_STATIC_INITIALIZER
// "expression.origin == null" means that the field is initialized when it is declared, // "expression.origin == null" means that the field is initialized when it is declared,
// i.e., not in an initializer block or constructor body. // i.e., not in an initializer block or constructor body.
val skip = irFunction is IrConstructor && irFunction.isPrimary && val isFieldInitializer = expression.origin == null
expression.origin == null && expressionValue is IrConst<*> && val skip = (inPrimaryConstructor || inClassInit) && isFieldInitializer && expressionValue is IrConst<*> &&
isDefaultValueForType(expression.symbol.owner.type.asmType, expressionValue.value) isDefaultValueForType(expression.symbol.owner.type.asmType, expressionValue.value)
return if (skip) voidValue.coerce(expression.asmType) else super.visitSetField(expression, data) return if (skip) voidValue.coerce(expression.asmType) else super.visitSetField(expression, data)
} }