From 11a10673803fd9c09549bca91b8f78b3d4727420 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 14 May 2013 17:12:58 +0400 Subject: [PATCH] Workaround assert when java function overrides kotlin property accessor #KT-3621 Open --- .../java/kotlinSignature/SignaturesPropagationData.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java index 264c5c67d69..62b5993f9f3 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java @@ -242,9 +242,10 @@ public class SignaturesPropagationData { continue; } - assert superFun instanceof FunctionDescriptor : superFun.getClass().getName(); - - superFunctions.add(substituteSuperFunction(superclassToSupertype, (FunctionDescriptor) superFun)); + // TODO: Add propagation for other kotlin descriptors (KT-3621) + if (superFun instanceof FunctionDescriptor) { + superFunctions.add(substituteSuperFunction(superclassToSupertype, (FunctionDescriptor) superFun)); + } } // sorting for diagnostic stability