diff options
author | Paul Phillips <paulp@improving.org> | 2011-07-28 07:04:26 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-07-28 07:04:26 +0000 |
commit | 892ecd2db75cb41cbcb582c26c2a7b32186625c0 (patch) | |
tree | ef7a68a88f4e2cbb4506afdf7f076f6119a2365c /test/files | |
parent | 5dbb616610b616bff7ec8bb9b78a6f8a59203d7d (diff) | |
download | scala-892ecd2db75cb41cbcb582c26c2a7b32186625c0.tar.gz scala-892ecd2db75cb41cbcb582c26c2a7b32186625c0.tar.bz2 scala-892ecd2db75cb41cbcb582c26c2a7b32186625c0.zip |
Changed forwarders not to generate final method...
Changed forwarders not to generate final methods, which otherwise would
induce VerifyErrors anytime the companion class was subclassed and had a
method with the same signature. Closes SI-4827, no review.
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/run/bug4827.scala | 15 | ||||
-rw-r--r-- | test/files/run/bug4827b.scala | 18 |
2 files changed, 33 insertions, 0 deletions
diff --git a/test/files/run/bug4827.scala b/test/files/run/bug4827.scala new file mode 100644 index 0000000000..7270cf169d --- /dev/null +++ b/test/files/run/bug4827.scala @@ -0,0 +1,15 @@ +object Test { + def main(args: Array[String]): Unit = Foo.foo() +} + +trait CommonTrait { + def foo(): String = null +} + +class Foo + +object Foo { + def goo() = new Foo() with CommonTrait + + def foo(): String = null +} diff --git a/test/files/run/bug4827b.scala b/test/files/run/bug4827b.scala new file mode 100644 index 0000000000..84d6d907d3 --- /dev/null +++ b/test/files/run/bug4827b.scala @@ -0,0 +1,18 @@ +package foo { + class Foo { } + object Foo { + def bippy(x: Int) = x + } +} + +package bar { + class Bippy extends foo.Foo { + def bippy(x: Int) = x + } +} + +object Test { + def main(args: Array[String]): Unit = { + new bar.Bippy bippy 5 + } +} |