fix for KT-261

idea/META-INF/plugin.xml

@@ -0,0 +1,23 @@
+<idea-plugin version="2">
+  <name>Plugin name here</name>
+  <description>short description of the plugin</description>
+  <version>1.0</version>
+  <vendor>YourCompany</vendor>
+  <idea-version since-build="8000"/>
+
+  <application-components>
+    <!-- Add your application components here -->
+  </application-components>
+
+  <project-components>
+    <!-- Add your project components here -->
+  </project-components>
+
+  <actions>
+    <!-- Add your actions here -->
+  </actions>
+
+  <extensions defaultExtensionNs="com.intellij">
+    <!-- Add your extensions here -->
+  </extensions>
+</idea-plugin>

idea/idea.iml

@@ -1,16 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/src/META-INF/plugin.xml" />
+  <component name="EclipseModuleManager">
+    <libelement value="jar://$MODULE_DIR$/../lib/asm-util-3.3.1.jar!/" />
+    <src_description expected_position="1">
+      <src_folder value="file://$MODULE_DIR$/src" expected_position="1" />
+      <src_folder value="file://$MODULE_DIR$/tests" expected_position="2" />
+    </src_description>
+  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA 10.x" jdkType="IDEA JDK" />
+    <orderEntry type="jdk" jdkName="IDEA IC-108.1043" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="asm" level="project" />
     <orderEntry type="module" module-name="stdlib" />
+    <orderEntry type="module-library">
+      <library name="asm-util-3.3.1.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../lib/asm-util-3.3.1.jar!/" />
+          <root url="jar://$USER_HOME$/IdeaProjects/untitled/lib/asm-util-3.3.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>
 

idea/src/org/jetbrains/jet/codegen/FunctionCodegen.java

@@ -1,5 +1,6 @@
 package org.jetbrains.jet.codegen;
 
+import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
@@ -7,6 +8,7 @@ import org.jetbrains.jet.lang.psi.JetDeclarationWithBody;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.psi.JetNamedFunction;
 import org.jetbrains.jet.lang.resolve.BindingContext;
+import org.jetbrains.jet.lang.types.JetTypeImpl;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
@@ -15,6 +17,7 @@ import org.objectweb.asm.commons.InstructionAdapter;
 import org.objectweb.asm.commons.Method;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * @author max
@@ -41,15 +44,41 @@ public class FunctionCodegen {
         ClassContext funContext = owner.intoFunction(functionDescriptor);
 
         final JetExpression bodyExpression = f.getBodyExpression();
-        generatedMethod(bodyExpression, jvmMethod, funContext, functionDescriptor.getValueParameters(), functionDescriptor.getTypeParameters());
+        generatedMethod(bodyExpression, jvmMethod, funContext, functionDescriptor);
+    }
+
+    private void generateBridgeMethod(Method function, Method overriden)
+    {
+        int flags = Opcodes.ACC_PUBLIC; // TODO.
+
+        final MethodVisitor mv = v.visitMethod(flags, function.getName(), overriden.getDescriptor(), null, null);
+            mv.visitCode();
+
+        Type[] argTypes = function.getArgumentTypes();
+        InstructionAdapterEx iv = new InstructionAdapterEx(mv);
+        iv.load(0, JetTypeMapper.TYPE_OBJECT);
+        for (int i = 0, reg = 1; i < argTypes.length; i++) {
+            Type argType = argTypes[i];
+            iv.load(reg, argType);
+            reg += argType.getSize();
+        }
+
+        iv.invokevirtual(state.getTypeMapper().jvmName((ClassDescriptor) owner.getContextDescriptor(), OwnerKind.IMPLEMENTATION), function.getName(), function.getDescriptor());
+        if(JetTypeMapper.isPrimitive(function.getReturnType()) && !JetTypeMapper.isPrimitive(overriden.getReturnType()))
+            iv.valueOf(function.getReturnType());
+        iv.areturn(overriden.getReturnType());
+        mv.visitMaxs(0, 0);
+        mv.visitEnd();
     }
 
     private void generatedMethod(JetExpression bodyExpressions,
                                  Method jvmSignature,
                                  ClassContext context,
-                                 List<ValueParameterDescriptor> paramDescrs,
-                                 List<TypeParameterDescriptor> typeParameters)
+                                 FunctionDescriptor functionDescriptor)
     {
+        List<ValueParameterDescriptor> paramDescrs = functionDescriptor.getValueParameters();
+        List<TypeParameterDescriptor> typeParameters = functionDescriptor.getTypeParameters();
+
         int flags = Opcodes.ACC_PUBLIC; // TODO.
 
         OwnerKind kind = context.getContextKind();
@@ -99,6 +128,16 @@ public class FunctionCodegen {
             }
             mv.visitMaxs(0, 0);
             mv.visitEnd();
+
+            Set<? extends FunctionDescriptor> overriddenFunctions = functionDescriptor.getOverriddenFunctions();
+            if(overriddenFunctions.size() > 0) {
+                for (FunctionDescriptor overriddenFunction : overriddenFunctions) {
+                    // TODO should we check params here as well?
+                    if(!JetTypeImpl.equalTypes(overriddenFunction.getReturnType(), functionDescriptor.getReturnType(), JetTypeImpl.EMPTY_AXIOMS)) {
+                        generateBridgeMethod(jvmSignature, state.getTypeMapper().mapSignature(overriddenFunction.getName(), overriddenFunction));
+                    }
+                }
+            }
         }
     }
 

idea/src/org/jetbrains/jet/lang/types/JetTypeImpl.java

@@ -17,7 +17,7 @@ import java.util.List;
  */
 public final class JetTypeImpl extends AnnotatedImpl implements JetType {
 
-    private static final HashBiMap<TypeConstructor,TypeConstructor> EMPTY_AXIOMS = HashBiMap.<TypeConstructor, TypeConstructor>create();
+    public static final HashBiMap<TypeConstructor,TypeConstructor> EMPTY_AXIOMS = HashBiMap.<TypeConstructor, TypeConstructor>create();
 
     private final TypeConstructor constructor;
     private final List<TypeProjection> arguments;

idea/testData/codegen/bridge.jet

@@ -0,0 +1,15 @@
+import java.lang.Integer
+
+class C {
+ fun f(): Any = "C f"
+}
+
+class D() : C {
+    fun f(): String = "D f"
+}
+
+fun box(): String{
+    val d : C = D()
+    if(d.f() != "D f") return "fail f"
+    return "OK"
+}

idea/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java

@@ -0,0 +1,9 @@
+package org.jetbrains.jet.codegen;
+
+import java.util.List;
+
+public class BridgeMethodGenTest extends CodegenTestCase {
+    public void testBridgeMethod () throws Exception {
+        blackBoxFile("bridge.jet");
+    }
+}