diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala | 1 | ||||
| -rw-r--r-- | test/files/run/t1747.scala | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala index 76aec33069..df655f076c 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -736,6 +736,7 @@ abstract class GenJVM extends SubComponent { && !m.isConstructor && !m.isStaticMember && !(m.owner == definitions.AnyClass) + && !module.isSubClass(module.linkedClassOfModule) && !conflictsIn(definitions.ObjectClass, m.name) && !conflictsIn(module.linkedClassOfModule, m.name)) diff --git a/test/files/run/t1747.scala b/test/files/run/t1747.scala new file mode 100644 index 0000000000..bcda6b52d1 --- /dev/null +++ b/test/files/run/t1747.scala @@ -0,0 +1,6 @@ +object Foo extends Foo { + def f {} +} +class Foo + +object Test extends Application { Foo }
\ No newline at end of file |