From 014d855449390a1cd464a7a7d5a7086db4d3f80c Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 12 Jun 2020 23:15:08 +0200 Subject: [PATCH] IR: minor, make all overrides in IrElementTransformerVoid final --- .../jetbrains/kotlin/ir/util/DeepCopyIrTreeWithSymbols.kt | 2 +- .../kotlin/ir/visitors/IrElementTransformerVoid.kt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyIrTreeWithSymbols.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyIrTreeWithSymbols.kt index 38127a9a627..450d4c33e74 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyIrTreeWithSymbols.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyIrTreeWithSymbols.kt @@ -91,7 +91,7 @@ open class DeepCopyIrTreeWithSymbols( declaration.files.transform() ) - override fun visitExternalPackageFragment(declaration: IrExternalPackageFragment, data: Nothing?): IrExternalPackageFragment = + override fun visitExternalPackageFragment(declaration: IrExternalPackageFragment): IrExternalPackageFragment = IrExternalPackageFragmentImpl( symbolRemapper.getDeclaredExternalPackageFragment(declaration.symbol), symbolRenamer.getExternalPackageFragmentName(declaration.symbol) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/visitors/IrElementTransformerVoid.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/visitors/IrElementTransformerVoid.kt index c8a16eac602..d1c6610e10e 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/visitors/IrElementTransformerVoid.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/visitors/IrElementTransformerVoid.kt @@ -32,15 +32,15 @@ abstract class IrElementTransformerVoid : IrElementTransformer { visitModuleFragment(declaration) open fun visitPackageFragment(declaration: IrPackageFragment): IrPackageFragment = declaration.transformChildren() - override fun visitPackageFragment(declaration: IrPackageFragment, data: Nothing?): IrElement = visitPackageFragment(declaration) + final override fun visitPackageFragment(declaration: IrPackageFragment, data: Nothing?): IrElement = visitPackageFragment(declaration) open fun visitFile(declaration: IrFile): IrFile = visitPackageFragment(declaration) as IrFile final override fun visitFile(declaration: IrFile, data: Nothing?): IrFile = visitFile(declaration) - open fun visitExternalPackageFragment(declaration: IrExternalPackageFragment) = + open fun visitExternalPackageFragment(declaration: IrExternalPackageFragment): IrExternalPackageFragment = visitPackageFragment(declaration) as IrExternalPackageFragment - override fun visitExternalPackageFragment(declaration: IrExternalPackageFragment, data: Nothing?): IrExternalPackageFragment = + final override fun visitExternalPackageFragment(declaration: IrExternalPackageFragment, data: Nothing?): IrExternalPackageFragment = visitExternalPackageFragment(declaration) open fun visitDeclaration(declaration: IrDeclaration): IrStatement = declaration.transformChildren() @@ -167,7 +167,7 @@ abstract class IrElementTransformerVoid : IrElementTransformer { final override fun visitMemberAccess(expression: IrMemberAccessExpression, data: Nothing?) = visitMemberAccess(expression) open fun visitFunctionAccess(expression: IrFunctionAccessExpression) = visitMemberAccess(expression) - override fun visitFunctionAccess(expression: IrFunctionAccessExpression, data: Nothing?) = visitFunctionAccess(expression) + final override fun visitFunctionAccess(expression: IrFunctionAccessExpression, data: Nothing?) = visitFunctionAccess(expression) open fun visitCall(expression: IrCall) = visitFunctionAccess(expression) final override fun visitCall(expression: IrCall, data: Nothing?) = visitCall(expression)