KT-1865 Calls with default argument values are generated incorrectly

#KT-1865 Fixed

js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java

@@ -125,4 +125,8 @@ public final class MiscTest extends AbstractExpressionTest {
     public void testExtensionLiteralCalledInsideExtensionFunction() throws Exception {
         checkFooBoxIsTrue("extensionLiteralCalledInsideExtensionFunction.kt");
     }
+
+    public void testKt1865() throws Exception {
+        checkFooBoxIsTrue("KT-1865.kt");
+    }
 }

js/js.translator/src/org/jetbrains/k2js/translate/reference/AbstractCallExpressionTranslator.java

@@ -57,7 +57,7 @@ public abstract class AbstractCallExpressionTranslator extends AbstractTranslato
         this.expression = expression;
         this.resolvedCall = getResolvedCallForCallExpression(bindingContext(), expression);
         this.receiver = receiver;
-        callType = type;
+        this.callType = type;
     }
 
     abstract public boolean shouldWrapVarargInArray();

js/js.translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java

@@ -57,7 +57,7 @@ public final class BindingUtils {
         assert descriptorClass.isInstance(descriptor)
                 : expression.toString() + " expected to have of type" + descriptorClass.toString();
         //noinspection unchecked
-        return (D)descriptor;
+        return (D) descriptor;
     }
 
     @NotNull
@@ -102,7 +102,7 @@ public final class BindingUtils {
             @NotNull SimpleFunctionDescriptor descriptor) {
         PsiElement result = BindingContextUtils.callableDescriptorToDeclaration(context, descriptor);
         assert result instanceof JetFunction : "SimpleFunctionDescriptor should have declaration of type JetFunction";
-        return (JetFunction)result;
+        return (JetFunction) result;
     }
 
     @NotNull
@@ -130,7 +130,7 @@ public final class BindingUtils {
             return null;
         }
         assert result instanceof JetDeclaration : "Descriptor should correspond to an element.";
-        return (JetDeclaration)result;
+        return (JetDeclaration) result;
     }
 
     @NotNull
@@ -138,7 +138,7 @@ public final class BindingUtils {
             @NotNull ValueParameterDescriptor descriptor) {
         PsiElement result = BindingContextUtils.descriptorToDeclaration(context, descriptor);
         assert result instanceof JetParameter : "ValueParameterDescriptor should have corresponding JetParameter.";
-        return (JetParameter)result;
+        return (JetParameter) result;
     }
 
     public static boolean hasAncestorClass(@NotNull BindingContext context, @NotNull JetClassOrObject classDeclaration) {
@@ -180,7 +180,7 @@ public final class BindingUtils {
         if (!(result instanceof JetProperty)) {
             return null;
         }
-        return (JetProperty)result;
+        return (JetProperty) result;
     }
 
     @NotNull
@@ -216,7 +216,7 @@ public final class BindingUtils {
         ResolvedCall<? extends CallableDescriptor> resolvedCall = context.get(BindingContext.RESOLVED_CALL, expression);
         assert resolvedCall != null : "Must resolve to a call.";
         if (resolvedCall instanceof VariableAsFunctionResolvedCall) {
-            return ((VariableAsFunctionResolvedCall)resolvedCall).getVariableCall();
+            return ((VariableAsFunctionResolvedCall) resolvedCall).getVariableCall();
         }
         return resolvedCall;
     }
@@ -245,7 +245,7 @@ public final class BindingUtils {
 
         assert descriptorForReferenceExpression instanceof FunctionDescriptor
                 : "Operation should resolve to function descriptor.";
-        return (FunctionDescriptor)descriptorForReferenceExpression;
+        return (FunctionDescriptor) descriptorForReferenceExpression;
     }
 
     @NotNull
@@ -268,13 +268,23 @@ public final class BindingUtils {
     @NotNull
     public static JetExpression getDefaultArgument(@NotNull BindingContext context,
             @NotNull ValueParameterDescriptor parameterDescriptor) {
-        assert parameterDescriptor.hasDefaultValue() : "Unsupplied parameter must have default value.";
+        ValueParameterDescriptor descriptorWhichDeclaresDefaultValue = getOriginalDescriptorWhichDeclaresDefaultValue(parameterDescriptor);
-        JetParameter psiParameter = getParameterForDescriptor(context, parameterDescriptor);
+        JetParameter psiParameter = getParameterForDescriptor(context, descriptorWhichDeclaresDefaultValue);
         JetExpression defaultValue = psiParameter.getDefaultValue();
         assert defaultValue != null : "No default value found in PSI.";
         return defaultValue;
     }
 
+    private static ValueParameterDescriptor getOriginalDescriptorWhichDeclaresDefaultValue(
+            @NotNull ValueParameterDescriptor parameterDescriptor) {
+        ValueParameterDescriptor result = parameterDescriptor;
+        assert result.hasDefaultValue() : "Unsupplied parameter must have default value.";
+        while (!result.declaresDefaultValue()) {
+            result = result.getOverriddenDescriptors().iterator().next();
+        }
+        return result;
+    }
+
     @NotNull
     public static FunctionDescriptor getIteratorFunction(@NotNull BindingContext context,
             @NotNull JetExpression rangeExpression) {

js/js.translator/testFiles/expression/misc/cases/KT-1865.kt

@@ -0,0 +1,11 @@
+package foo
+
+open class A {
+  open fun foo(a : Int = 1) = a
+}
+
+class B : A() {
+  override fun foo(a : Int) = a + 1
+}
+
+fun box() = (B().foo() == 2)