Do not add extra 'this' parameter for TImpl's accessor

Fixes weird cases like super-call from a closure inside a trait with a required
class

compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java

@@ -519,8 +519,6 @@ public class JetTypeMapper extends BindingTraceAware {
 
         signatureVisitor.writeParametersStart();
 
-        writeThisForAccessorIfNeeded(f, signatureVisitor);
-
         if (kind == OwnerKind.TRAIT_IMPL) {
             ClassDescriptor containingDeclaration = (ClassDescriptor) f.getContainingDeclaration();
             JetType jetType = CodegenUtil.getSuperClass(containingDeclaration);
@@ -534,6 +532,9 @@ public class JetTypeMapper extends BindingTraceAware {
             signatureVisitor.writeAsmType(type, jetType.isNullable());
             signatureVisitor.writeParameterTypeEnd();
         }
+        else {
+            writeThisForAccessorIfNeeded(f, signatureVisitor);
+        }
 
         if (receiverType != null) {
             signatureVisitor.writeParameterType(JvmMethodParameterKind.RECEIVER);

compiler/testData/codegen/traits/withRequiredSuper.kt

@@ -0,0 +1,16 @@
+open class Base {
+    open fun foo() { }
+}
+
+trait Derived : Base {
+    override fun foo() {
+        super.foo()
+    }
+}
+
+class DerivedImpl : Derived, Base()
+
+fun box(): String {
+    DerivedImpl().foo()
+    return "OK"
+}

compiler/testData/codegen/traits/withRequiredSuperViaBridge.kt

@@ -0,0 +1,20 @@
+open class Base {
+    open fun foo() { }
+}
+
+trait Derived : Base {
+    override fun foo() {
+        object {
+            fun bar() {
+                super<Base>@Derived.foo()
+            }
+        }.bar()
+    }
+}
+
+class DerivedImpl : Derived, Base()
+
+fun box(): String {
+    DerivedImpl().foo()
+    return "OK"
+}

compiler/tests/org/jetbrains/jet/codegen/TraitsTest.java

@@ -88,4 +88,12 @@ public class TraitsTest extends CodegenTestCase {
     public void testKt2963() {
         blackBoxFile("regressions/kt2963.kt");
     }
+
+    public void testWithRequiredSuper() {
+        blackBoxFile("traits/withRequiredSuper.kt");
+    }
+
+    public void testWithRequiredSuperViaBridge() {
+        blackBoxFile("traits/withRequiredSuperViaBridge.kt");
+    }
 }