diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java index 8f2ee0afe8c..271065c15cf 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java @@ -743,7 +743,7 @@ public class FunctionCodegen extends GenerationStateAware { FunctionDescriptor functionDescriptor, Method overridden ) { - int flags = ACC_PUBLIC | ACC_BRIDGE; // TODO. + int flags = ACC_PUBLIC | ACC_BRIDGE | ACC_SYNTHETIC; // TODO. final MethodVisitor mv = v.newMethod(null, flags, jvmSignature.getName(), overridden.getDescriptor(), null, null); if (state.getClassBuilderMode() == ClassBuilderMode.STUBS) { diff --git a/compiler/testData/loadKotlin/fun/PropagateSubclassOfComparable.kt b/compiler/testData/loadKotlin/fun/PropagateSubclassOfComparable.kt new file mode 100644 index 00000000000..bc4a5575181 --- /dev/null +++ b/compiler/testData/loadKotlin/fun/PropagateSubclassOfComparable.kt @@ -0,0 +1,5 @@ +package test + +class PropagateSubclassOfComparable(): Comparable { + override fun compareTo(other: PropagateSubclassOfComparable): Int = throw IllegalStateException() +} \ No newline at end of file diff --git a/compiler/testData/loadKotlin/fun/PropagateSubclassOfComparable.txt b/compiler/testData/loadKotlin/fun/PropagateSubclassOfComparable.txt new file mode 100644 index 00000000000..bd19bf98635 --- /dev/null +++ b/compiler/testData/loadKotlin/fun/PropagateSubclassOfComparable.txt @@ -0,0 +1,6 @@ +namespace test + +internal final class test.PropagateSubclassOfComparable : jet.Comparable { + public final /*constructor*/ fun (): test.PropagateSubclassOfComparable + public open override /*1*/ fun compareTo(/*0*/ other: test.PropagateSubclassOfComparable): jet.Int +} diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java index 3bf78d93496..6518b099279 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java @@ -336,6 +336,11 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/fun"), "kt", true); } + @TestMetadata("PropagateSubclassOfComparable.kt") + public void testPropagateSubclassOfComparable() throws Exception { + doTest("compiler/testData/loadKotlin/fun/PropagateSubclassOfComparable.kt"); + } + @TestMetadata("compiler/testData/loadKotlin/fun/genericWithTypeVariables") public static class GenericWithTypeVariables extends AbstractLoadCompiledKotlinTest { public void testAllFilesPresentInGenericWithTypeVariables() throws Exception { diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java index e7e3a46b2b8..0bf4581aaaa 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java @@ -70,6 +70,11 @@ public class LazyResolveDescriptorRendererTestGenerated extends AbstractLazyReso doTest("compiler/testData/renderer/InheritedMembersVisibility.kt"); } + @TestMetadata("KeywordsInNames.kt") + public void testKeywordsInNames() throws Exception { + doTest("compiler/testData/renderer/KeywordsInNames.kt"); + } + @TestMetadata("TupleTypes.kt") public void testTupleTypes() throws Exception { doTest("compiler/testData/renderer/TupleTypes.kt"); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java index c0c16cc851a..8bee7694da7 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java @@ -338,6 +338,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/fun"), "kt", true); } + @TestMetadata("PropagateSubclassOfComparable.kt") + public void testPropagateSubclassOfComparable() throws Exception { + doTestSinglePackage("compiler/testData/loadKotlin/fun/PropagateSubclassOfComparable.kt"); + } + @TestMetadata("compiler/testData/loadKotlin/fun/genericWithTypeVariables") public static class GenericWithTypeVariables extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInGenericWithTypeVariables() throws Exception {