From 682f8a3110575b2cb4ab677063d3a1cdb7c5d60f Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Sun, 15 Mar 2015 13:06:32 +0300 Subject: [PATCH] Use original constructor descriptor when searching cycles --- .../frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java index 1136d8d6a7b..b2234a081e9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java @@ -239,7 +239,7 @@ public class BodyResolver { @Nullable private ConstructorDescriptor getDelegatedConstructor(@NotNull ConstructorDescriptor constructor) { ResolvedCall call = trace.get(CONSTRUCTOR_RESOLVED_DELEGATION_CALL, constructor); - return call == null ? null : call.getResultingDescriptor(); + return call == null ? null : call.getResultingDescriptor().getOriginal(); } public void resolveBodies(@NotNull BodiesResolveContext c) {