From dd275eda78cf4b09d58b73db2699e7994241dc9a Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 8 Feb 2017 14:11:39 +0300 Subject: [PATCH] Minor. Refine class name: JvmStaticGenerator -> JvmStaticInCompanionObjectGenerator --- .../src/org/jetbrains/kotlin/codegen/FunctionCodegen.java | 5 +++-- ...icGenerator.kt => JvmStaticInCompanionObjectGenerator.kt} | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) rename compiler/backend/src/org/jetbrains/kotlin/codegen/{JvmStaticGenerator.kt => JvmStaticInCompanionObjectGenerator.kt} (99%) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java index e9b9f035721..ff111c11d9e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java @@ -231,7 +231,7 @@ public class FunctionCodegen { boolean staticInCompanionObject = CodegenUtilKt.isJvmStaticInCompanionObject(functionDescriptor); if (staticInCompanionObject) { ImplementationBodyCodegen parentBodyCodegen = (ImplementationBodyCodegen) memberCodegen.getParentCodegen(); - parentBodyCodegen.addAdditionalTask(new JvmStaticGenerator(functionDescriptor, origin, state, parentBodyCodegen)); + parentBodyCodegen.addAdditionalTask(new JvmStaticInCompanionObjectGenerator(functionDescriptor, origin, state, parentBodyCodegen)); } if (!state.getClassBuilderMode().generateBodies || isAbstractMethod(functionDescriptor, contextKind, state)) { @@ -256,7 +256,8 @@ public class FunctionCodegen { else if (staticInCompanionObject) { // native @JvmStatic foo() in companion object should delegate to the static native function moved to the outer class mv.visitCode(); - FunctionDescriptor staticFunctionDescriptor = JvmStaticGenerator.createStaticFunctionDescriptor(functionDescriptor); + FunctionDescriptor staticFunctionDescriptor = JvmStaticInCompanionObjectGenerator + .createStaticFunctionDescriptor(functionDescriptor); Method accessorMethod = typeMapper.mapAsmMethod(memberCodegen.getContext().accessibleDescriptor(staticFunctionDescriptor, null)); Type owningType = typeMapper.mapClass((ClassifierDescriptor) staticFunctionDescriptor.getContainingDeclaration()); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmStaticGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmStaticInCompanionObjectGenerator.kt similarity index 99% rename from compiler/backend/src/org/jetbrains/kotlin/codegen/JvmStaticGenerator.kt rename to compiler/backend/src/org/jetbrains/kotlin/codegen/JvmStaticInCompanionObjectGenerator.kt index 695fc23887a..6f0c2716c08 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmStaticGenerator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmStaticInCompanionObjectGenerator.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin import org.jetbrains.kotlin.resolve.jvm.diagnostics.Synthetic import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature -class JvmStaticGenerator( +class JvmStaticInCompanionObjectGenerator( val descriptor: FunctionDescriptor, val declarationOrigin: JvmDeclarationOrigin, val state: GenerationState,