IrElementTransformerVoid

This commit is contained in:
Dmitry Petrov
2016-09-16 15:39:02 +03:00
committed by Dmitry Petrov
parent e0129ef33b
commit b19bcc0587
3 changed files with 264 additions and 55 deletions
@@ -21,7 +21,8 @@ import org.jetbrains.kotlin.ir.IrElement
import org.jetbrains.kotlin.ir.declarations.IrVariable
import org.jetbrains.kotlin.ir.expressions.*
import org.jetbrains.kotlin.ir.expressions.impl.IrTypeOperatorCallImpl
import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
import org.jetbrains.kotlin.psi2ir.containsNull
import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
@@ -33,14 +34,14 @@ fun insertImplicitCasts(builtIns: KotlinBuiltIns, element: IrElement) {
element.transformChildren(InsertImplicitCasts(builtIns), null)
}
class InsertImplicitCasts(val builtIns: KotlinBuiltIns): IrElementTransformer<Nothing?> {
override fun visitElement(element: IrElement, data: Nothing?): IrElement {
element.transformChildren(this, data)
class InsertImplicitCasts(val builtIns: KotlinBuiltIns): IrElementTransformerVoid {
override fun visitElement(element: IrElement): IrElement {
element.transformChildrenVoid(this)
return element
}
override fun visitGeneralCall(expression: IrGeneralCall, data: Nothing?): IrExpression {
expression.transformChildren(this, data)
override fun visitGeneralCall(expression: IrGeneralCall): IrExpression {
expression.transformChildrenVoid(this)
with(expression) {
dispatchReceiver = dispatchReceiver?.cast(descriptor.dispatchReceiverParameter?.type)
@@ -55,8 +56,8 @@ class InsertImplicitCasts(val builtIns: KotlinBuiltIns): IrElementTransformer<No
return expression
}
override fun visitBlock(expression: IrBlock, data: Nothing?): IrExpression {
expression.transformChildren(this, data)
override fun visitBlock(expression: IrBlock): IrExpression {
expression.transformChildrenVoid(this)
val type = expression.type
if (expression.statements.isEmpty() || KotlinBuiltIns.isUnit(type) || KotlinBuiltIns.isNothing(type)) {
@@ -71,40 +72,40 @@ class InsertImplicitCasts(val builtIns: KotlinBuiltIns): IrElementTransformer<No
return expression
}
override fun visitReturn(expression: IrReturn, data: Nothing?): IrExpression {
expression.transformChildren(this, data)
override fun visitReturn(expression: IrReturn): IrExpression {
expression.transformChildrenVoid(this)
expression.value = expression.value?.cast(expression.returnTarget.returnType)
return expression
}
override fun visitSetVariable(expression: IrSetVariable, data: Nothing?): IrExpression {
expression.transformChildren(this, data)
override fun visitSetVariable(expression: IrSetVariable): IrExpression {
expression.transformChildrenVoid(this)
expression.value = expression.value.cast(expression.descriptor.type)
return expression
}
override fun visitSetField(expression: IrSetField, data: Nothing?): IrExpression {
expression.transformChildren(this, data)
override fun visitSetField(expression: IrSetField): IrExpression {
expression.transformChildrenVoid(this)
expression.value = expression.value.cast(expression.descriptor.type)
return expression
}
override fun visitVariable(declaration: IrVariable, data: Nothing?): IrVariable {
declaration.transformChildren(this, data)
override fun visitVariable(declaration: IrVariable): IrVariable {
declaration.transformChildrenVoid(this)
declaration.initializer = declaration.initializer?.cast(declaration.descriptor.type)
return declaration
}
override fun visitWhen(expression: IrWhen, data: Nothing?): IrExpression {
expression.transformChildren(this, data)
override fun visitWhen(expression: IrWhen): IrExpression {
expression.transformChildrenVoid(this)
val resultType = expression.type
@@ -121,24 +122,24 @@ class InsertImplicitCasts(val builtIns: KotlinBuiltIns): IrElementTransformer<No
return expression
}
override fun visitLoop(loop: IrLoop, data: Nothing?): IrExpression {
loop.transformChildren(this, data)
override fun visitLoop(loop: IrLoop): IrExpression {
loop.transformChildrenVoid(this)
loop.condition = loop.condition.cast(builtIns.booleanType)
return loop
}
override fun visitThrow(expression: IrThrow, data: Nothing?): IrExpression {
expression.transformChildren(this, data)
override fun visitThrow(expression: IrThrow): IrExpression {
expression.transformChildrenVoid(this)
expression.value = expression.value.cast(builtIns.throwable.defaultType)
return expression
}
override fun visitTry(aTry: IrTry, data: Nothing?): IrExpression {
aTry.transformChildren(this, data)
override fun visitTry(aTry: IrTry): IrExpression {
aTry.transformChildrenVoid(this)
val resultType = aTry.type
@@ -151,8 +152,8 @@ class InsertImplicitCasts(val builtIns: KotlinBuiltIns): IrElementTransformer<No
return aTry
}
override fun visitVararg(expression: IrVararg, data: Nothing?): IrExpression {
expression.transformChildren(this, data)
override fun visitVararg(expression: IrVararg): IrExpression {
expression.transformChildrenVoid(this)
expression.elements.forEachIndexed { i, element ->
when (element) {
@@ -22,25 +22,17 @@ import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.expressions.*
interface IrElementTransformer<in D> : IrElementVisitor<IrElement, D> {
override fun visitElement(element: IrElement, data: D): IrElement {
element.transformChildren(this, data)
return element
}
override fun visitElement(element: IrElement, data: D): IrElement =
element.apply { transformChildren(this@IrElementTransformer, data) }
override fun visitModuleFragment(declaration: IrModuleFragment, data: D): IrModuleFragment {
declaration.transformChildren(this, data)
return declaration
}
override fun visitModuleFragment(declaration: IrModuleFragment, data: D): IrModuleFragment =
declaration.apply { transformChildren(this@IrElementTransformer, data) }
override fun visitFile(declaration: IrFile, data: D): IrFile {
declaration.transformChildren(this, data)
return declaration
}
override fun visitFile(declaration: IrFile, data: D): IrFile =
declaration.apply { transformChildren(this@IrElementTransformer, data) }
override fun visitDeclaration(declaration: IrDeclaration, data: D): IrStatement {
declaration.transformChildren(this, data)
return declaration
}
override fun visitDeclaration(declaration: IrDeclaration, data: D): IrStatement =
declaration.apply { transformChildren(this@IrElementTransformer, data) }
override fun visitClass(declaration: IrClass, data: D) = visitDeclaration(declaration, data)
override fun visitTypeAlias(declaration: IrTypeAlias, data: D) = visitDeclaration(declaration, data)
@@ -53,23 +45,21 @@ interface IrElementTransformer<in D> : IrElementVisitor<IrElement, D> {
override fun visitAnonymousInitializer(declaration: IrAnonymousInitializer, data: D) = visitDeclaration(declaration, data)
override fun visitVariable(declaration: IrVariable, data: D) = visitDeclaration(declaration, data)
override fun visitBody(body: IrBody, data: D): IrBody {
body.transformChildren(this, data)
return body
}
override fun visitBody(body: IrBody, data: D): IrBody =
body.apply { transformChildren(this@IrElementTransformer, data) }
override fun visitExpressionBody(body: IrExpressionBody, data: D) = visitBody(body, data)
override fun visitBlockBody(body: IrBlockBody, data: D) = visitBody(body, data)
override fun visitSyntheticBody(body: IrSyntheticBody, data: D) = visitBody(body, data)
override fun visitExpression(expression: IrExpression, data: D): IrExpression {
expression.transformChildren(this, data)
return expression
}
override fun visitExpression(expression: IrExpression, data: D): IrExpression =
expression.apply { transformChildren(this@IrElementTransformer, data) }
override fun <T> visitConst(expression: IrConst<T>, data: D) = visitExpression(expression, data)
override fun visitVararg(expression: IrVararg, data: D) = visitExpression(expression, data)
override fun visitSpreadElement(spread: IrSpreadElement, data: D): IrSpreadElement = spread
override fun visitSpreadElement(spread: IrSpreadElement, data: D): IrSpreadElement =
spread.apply { transformChildren(this@IrElementTransformer, data) }
override fun visitContainerExpression(expression: IrContainerExpression, data: D) = visitExpression(expression, data)
override fun visitBlock(expression: IrBlock, data: D) = visitContainerExpression(expression, data)
@@ -107,10 +97,8 @@ interface IrElementTransformer<in D> : IrElementVisitor<IrElement, D> {
override fun visitDoWhileLoop(loop: IrDoWhileLoop, data: D) = visitLoop(loop, data)
override fun visitTry(aTry: IrTry, data: D) = visitExpression(aTry, data)
override fun visitCatch(aCatch: IrCatch, data: D): IrCatch {
aCatch.transformChildren(this, data)
return aCatch
}
override fun visitCatch(aCatch: IrCatch, data: D): IrCatch =
aCatch.apply { transformChildren(this@IrElementTransformer, data) }
override fun visitBreakContinue(jump: IrBreakContinue, data: D) = visitExpression(jump, data)
override fun visitBreak(jump: IrBreak, data: D) = visitBreakContinue(jump, data)
@@ -0,0 +1,220 @@
/*
* Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.ir.visitors
import org.jetbrains.kotlin.ir.IrElement
import org.jetbrains.kotlin.ir.IrStatement
import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.expressions.*
interface IrElementTransformerVoid : IrElementTransformer<Nothing?> {
fun visitElement(element: IrElement): IrElement =
element.apply { transformChildrenVoid(this@IrElementTransformerVoid) }
override fun visitElement(element: IrElement, data: Nothing?): IrElement = visitElement(element)
fun visitModuleFragment(declaration: IrModuleFragment): IrModuleFragment =
declaration.apply { transformChildrenVoid(this@IrElementTransformerVoid) }
override fun visitModuleFragment(declaration: IrModuleFragment, data: Nothing?): IrModuleFragment = visitModuleFragment(declaration)
fun visitFile(declaration: IrFile): IrFile =
declaration.apply { transformChildrenVoid(this@IrElementTransformerVoid) }
override fun visitFile(declaration: IrFile, data: Nothing?): IrFile = visitFile(declaration)
fun visitDeclaration(declaration: IrDeclaration): IrStatement =
declaration.apply { transformChildrenVoid(this@IrElementTransformerVoid) }
override fun visitDeclaration(declaration: IrDeclaration, data: Nothing?): IrStatement = visitDeclaration(declaration)
fun visitClass(declaration: IrClass) = visitDeclaration(declaration)
override fun visitClass(declaration: IrClass, data: Nothing?) = visitClass(declaration)
fun visitTypeAlias(declaration: IrTypeAlias) = visitDeclaration(declaration)
override fun visitTypeAlias(declaration: IrTypeAlias, data: Nothing?) = visitTypeAlias(declaration)
fun visitFunction(declaration: IrFunction) = visitDeclaration(declaration)
override fun visitFunction(declaration: IrFunction, data: Nothing?) = visitFunction(declaration)
fun visitConstructor(declaration: IrConstructor) = visitFunction(declaration)
override fun visitConstructor(declaration: IrConstructor, data: Nothing?) = visitConstructor(declaration)
fun visitProperty(declaration: IrProperty) = visitDeclaration(declaration)
override fun visitProperty(declaration: IrProperty, data: Nothing?) = visitProperty(declaration)
fun visitField(declaration: IrField) = visitDeclaration(declaration)
override fun visitField(declaration: IrField, data: Nothing?) = visitField(declaration)
fun visitLocalDelegatedProperty(declaration: IrLocalDelegatedProperty) = visitDeclaration(declaration)
override fun visitLocalDelegatedProperty(declaration: IrLocalDelegatedProperty, data: Nothing?) = visitLocalDelegatedProperty(declaration)
fun visitEnumEntry(declaration: IrEnumEntry) = visitDeclaration(declaration)
override fun visitEnumEntry(declaration: IrEnumEntry, data: Nothing?) = visitEnumEntry(declaration)
fun visitAnonymousInitializer(declaration: IrAnonymousInitializer) = visitDeclaration(declaration)
override fun visitAnonymousInitializer(declaration: IrAnonymousInitializer, data: Nothing?) = visitAnonymousInitializer(declaration)
fun visitVariable(declaration: IrVariable) = visitDeclaration(declaration)
override fun visitVariable(declaration: IrVariable, data: Nothing?) = visitVariable(declaration)
fun visitBody(body: IrBody): IrBody =
body.apply { transformChildrenVoid(this@IrElementTransformerVoid) }
override fun visitBody(body: IrBody, data: Nothing?): IrBody = visitBody(body)
fun visitExpressionBody(body: IrExpressionBody) = visitBody(body)
override fun visitExpressionBody(body: IrExpressionBody, data: Nothing?) = visitExpressionBody(body)
fun visitBlockBody(body: IrBlockBody) = visitBody(body)
override fun visitBlockBody(body: IrBlockBody, data: Nothing?) = visitBlockBody(body)
fun visitSyntheticBody(body: IrSyntheticBody) = visitBody(body)
override fun visitSyntheticBody(body: IrSyntheticBody, data: Nothing?) = visitSyntheticBody(body)
fun visitExpression(expression: IrExpression): IrExpression =
expression.apply { transformChildrenVoid(this@IrElementTransformerVoid) }
override fun visitExpression(expression: IrExpression, data: Nothing?): IrExpression = visitExpression(expression)
fun <T> visitConst(expression: IrConst<T>) = visitExpression(expression)
override fun <T> visitConst(expression: IrConst<T>, data: Nothing?) = visitConst(expression)
fun visitVararg(expression: IrVararg) = visitExpression(expression)
override fun visitVararg(expression: IrVararg, data: Nothing?) = visitVararg(expression)
fun visitSpreadElement(spread: IrSpreadElement) =
spread.apply { transformChildrenVoid(this@IrElementTransformerVoid) }
override fun visitSpreadElement(spread: IrSpreadElement, data: Nothing?): IrSpreadElement = visitSpreadElement(spread)
fun visitContainerExpression(expression: IrContainerExpression) = visitExpression(expression)
override fun visitContainerExpression(expression: IrContainerExpression, data: Nothing?) = visitContainerExpression(expression)
fun visitBlock(expression: IrBlock) = visitContainerExpression(expression)
override fun visitBlock(expression: IrBlock, data: Nothing?) = visitBlock(expression)
fun visitComposite(expression: IrComposite) = visitContainerExpression(expression)
override fun visitComposite(expression: IrComposite, data: Nothing?) = visitComposite(expression)
fun visitStringConcatenation(expression: IrStringConcatenation) = visitExpression(expression)
override fun visitStringConcatenation(expression: IrStringConcatenation, data: Nothing?) = visitStringConcatenation(expression)
fun visitThisReference(expression: IrThisReference) = visitExpression(expression)
override fun visitThisReference(expression: IrThisReference, data: Nothing?) = visitThisReference(expression)
fun visitDeclarationReference(expression: IrDeclarationReference) = visitExpression(expression)
override fun visitDeclarationReference(expression: IrDeclarationReference, data: Nothing?) = visitDeclarationReference(expression)
fun visitSingletonReference(expression: IrGetSingletonValue) = visitDeclarationReference(expression)
override fun visitSingletonReference(expression: IrGetSingletonValue, data: Nothing?) = visitSingletonReference(expression)
fun visitGetObjectValue(expression: IrGetObjectValue) = visitSingletonReference(expression)
override fun visitGetObjectValue(expression: IrGetObjectValue, data: Nothing?) = visitGetObjectValue(expression)
fun visitGetEnumValue(expression: IrGetEnumValue) = visitSingletonReference(expression)
override fun visitGetEnumValue(expression: IrGetEnumValue, data: Nothing?) = visitGetEnumValue(expression)
fun visitVariableAccess(expression: IrVariableAccessExpression) = visitDeclarationReference(expression)
override fun visitVariableAccess(expression: IrVariableAccessExpression, data: Nothing?) = visitVariableAccess(expression)
fun visitGetVariable(expression: IrGetVariable) = visitVariableAccess(expression)
override fun visitGetVariable(expression: IrGetVariable, data: Nothing?) = visitGetVariable(expression)
fun visitSetVariable(expression: IrSetVariable) = visitVariableAccess(expression)
override fun visitSetVariable(expression: IrSetVariable, data: Nothing?) = visitSetVariable(expression)
fun visitFieldAccess(expression: IrFieldAccessExpression) = visitDeclarationReference(expression)
override fun visitFieldAccess(expression: IrFieldAccessExpression, data: Nothing?) = visitFieldAccess(expression)
fun visitGetField(expression: IrGetField) = visitFieldAccess(expression)
override fun visitGetField(expression: IrGetField, data: Nothing?) = visitGetField(expression)
fun visitSetField(expression: IrSetField) = visitFieldAccess(expression)
override fun visitSetField(expression: IrSetField, data: Nothing?) = visitSetField(expression)
fun visitGetExtensionReceiver(expression: IrGetExtensionReceiver) = visitDeclarationReference(expression)
override fun visitGetExtensionReceiver(expression: IrGetExtensionReceiver, data: Nothing?) = visitGetExtensionReceiver(expression)
fun visitGeneralCall(expression: IrGeneralCall) = visitDeclarationReference(expression)
override fun visitGeneralCall(expression: IrGeneralCall, data: Nothing?) = visitGeneralCall(expression)
fun visitCall(expression: IrCall) = visitGeneralCall(expression)
override fun visitCall(expression: IrCall, data: Nothing?) = visitCall(expression)
fun visitDelegatingConstructorCall(expression: IrDelegatingConstructorCall) = visitGeneralCall(expression)
override fun visitDelegatingConstructorCall(expression: IrDelegatingConstructorCall, data: Nothing?) = visitDelegatingConstructorCall(expression)
fun visitEnumConstructorCall(expression: IrEnumConstructorCall) = visitGeneralCall(expression)
override fun visitEnumConstructorCall(expression: IrEnumConstructorCall, data: Nothing?) = visitEnumConstructorCall(expression)
fun visitGetClass(expression: IrGetClass) = visitExpression(expression)
override fun visitGetClass(expression: IrGetClass, data: Nothing?) = visitGetClass(expression)
fun visitCallableReference(expression: IrCallableReference) = visitGeneralCall(expression)
override fun visitCallableReference(expression: IrCallableReference, data: Nothing?) = visitCallableReference(expression)
fun visitClassReference(expression: IrClassReference) = visitDeclarationReference(expression)
override fun visitClassReference(expression: IrClassReference, data: Nothing?) = visitClassReference(expression)
fun visitInstanceInitializerCall(expression: IrInstanceInitializerCall) = visitExpression(expression)
override fun visitInstanceInitializerCall(expression: IrInstanceInitializerCall, data: Nothing?) = visitInstanceInitializerCall(expression)
fun visitTypeOperator(expression: IrTypeOperatorCall) = visitExpression(expression)
override fun visitTypeOperator(expression: IrTypeOperatorCall, data: Nothing?) = visitTypeOperator(expression)
fun visitWhen(expression: IrWhen) = visitExpression(expression)
override fun visitWhen(expression: IrWhen, data: Nothing?) = visitWhen(expression)
fun visitLoop(loop: IrLoop) = visitExpression(loop)
override fun visitLoop(loop: IrLoop, data: Nothing?) = visitLoop(loop)
fun visitWhileLoop(loop: IrWhileLoop) = visitLoop(loop)
override fun visitWhileLoop(loop: IrWhileLoop, data: Nothing?) = visitWhileLoop(loop)
fun visitDoWhileLoop(loop: IrDoWhileLoop) = visitLoop(loop)
override fun visitDoWhileLoop(loop: IrDoWhileLoop, data: Nothing?) = visitDoWhileLoop(loop)
fun visitTry(aTry: IrTry) = visitExpression(aTry)
override fun visitTry(aTry: IrTry, data: Nothing?) = visitTry(aTry)
override fun visitCatch(aCatch: IrCatch, data: Nothing?): IrCatch =
aCatch.apply { transformChildrenVoid(this@IrElementTransformerVoid) }
fun visitBreakContinue(jump: IrBreakContinue) = visitExpression(jump)
override fun visitBreakContinue(jump: IrBreakContinue, data: Nothing?) = visitBreakContinue(jump)
fun visitBreak(jump: IrBreak) = visitBreakContinue(jump)
override fun visitBreak(jump: IrBreak, data: Nothing?) = visitBreak(jump)
fun visitContinue(jump: IrContinue) = visitBreakContinue(jump)
override fun visitContinue(jump: IrContinue, data: Nothing?) = visitContinue(jump)
fun visitReturn(expression: IrReturn) = visitExpression(expression)
override fun visitReturn(expression: IrReturn, data: Nothing?) = visitReturn(expression)
fun visitThrow(expression: IrThrow) = visitExpression(expression)
override fun visitThrow(expression: IrThrow, data: Nothing?) = visitThrow(expression)
fun visitErrorDeclaration(declaration: IrErrorDeclaration) = visitDeclaration(declaration)
override fun visitErrorDeclaration(declaration: IrErrorDeclaration, data: Nothing?) = visitErrorDeclaration(declaration)
fun visitErrorExpression(expression: IrErrorExpression) = visitExpression(expression)
override fun visitErrorExpression(expression: IrErrorExpression, data: Nothing?) = visitErrorExpression(expression)
fun visitErrorCallExpression(expression: IrErrorCallExpression) = visitErrorExpression(expression)
override fun visitErrorCallExpression(expression: IrErrorCallExpression, data: Nothing?) = visitErrorCallExpression(expression)
}
fun IrElement.transformChildrenVoid(transformer: IrElementTransformerVoid) {
transformChildren(transformer, null)
}