From c6290efbe2bd7e30973bac2dad1d3bd639fbfc16 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Mon, 16 Mar 2015 13:39:45 +0300 Subject: [PATCH] Fix origin of secondary constructors --- .../jetbrains/kotlin/codegen/ImplementationBodyCodegen.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index f7c8d2392dc..29d73e2c329 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -1087,7 +1087,8 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { private void generateSecondaryConstructor(@NotNull ConstructorDescriptor constructorDescriptor) { ConstructorContext constructorContext = context.intoConstructor(constructorDescriptor); - functionCodegen.generateMethod(OtherOrigin(myClass, constructorDescriptor), constructorDescriptor, constructorContext, + functionCodegen.generateMethod(OtherOrigin(descriptorToDeclaration(constructorDescriptor), constructorDescriptor), + constructorDescriptor, constructorContext, new FunctionGenerationStrategy.CodegenBased(state, constructorDescriptor) { @Override public void doGenerateBody(@NotNull ExpressionCodegen codegen, @NotNull JvmMethodSignature signature) {