From 5077404c801ed664037e50bae94e1cad37abc299 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Mon, 20 Feb 2012 17:09:00 +0400 Subject: [PATCH] no overriden descriptors in ErrorNamedFunctionDescriptorImpl fixes stack overflow in KT-1206 --- .../lang/types/error/ErrorNamedFunctionDescriptorImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/error/ErrorNamedFunctionDescriptorImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/error/ErrorNamedFunctionDescriptorImpl.java index a14464b5144..1bd033fe6f0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/error/ErrorNamedFunctionDescriptorImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/error/ErrorNamedFunctionDescriptorImpl.java @@ -17,6 +17,7 @@ package org.jetbrains.jet.lang.types.error; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptorImpl; import org.jetbrains.jet.lang.descriptors.NamedFunctionDescriptor; @@ -49,4 +50,9 @@ public class ErrorNamedFunctionDescriptorImpl extends NamedFunctionDescriptorImp public NamedFunctionDescriptor copy(DeclarationDescriptor newOwner, boolean makeNonAbstract, Kind kind, boolean copyOverrides) { return this; } + + @Override + public void addOverriddenDescriptor(@NotNull CallableMemberDescriptor overriddenFunction) { + // nop + } }