summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-08-09 19:38:22 +0000
committerPaul Phillips <paulp@improving.org>2011-08-09 19:38:22 +0000
commit84189c6b15fc390a9bc2dc67b9d57935a6933e90 (patch)
tree4ed3e7c637913de7116a74040e2df5e7365bd681
parent335a6bd99b6e6e9922756c74f987c706bd21b1de (diff)
downloadscala-84189c6b15fc390a9bc2dc67b9d57935a6933e90.tar.gz
scala-84189c6b15fc390a9bc2dc67b9d57935a6933e90.tar.bz2
scala-84189c6b15fc390a9bc2dc67b9d57935a6933e90.zip
Another "great moments in java5 vs.
have lived through before: java5 wrongly prints "volatile" next to bridge methods, because ACC_BRIDGE uses the same bit as ACC_VOLATILE. Result: partest failure! No review.
-rw-r--r--test/files/run/bug4891.check1
-rw-r--r--test/files/run/bug4891/S_1.scala2
2 files changed, 1 insertions, 2 deletions
diff --git a/test/files/run/bug4891.check b/test/files/run/bug4891.check
index 2e84168ed4..072f8df8d4 100644
--- a/test/files/run/bug4891.check
+++ b/test/files/run/bug4891.check
@@ -4,6 +4,5 @@ test.generic.C1
(m) public void test.generic.C1.m1()
test.generic.C2
(m) public void test.generic.C1.m1()
- (m) public A test.generic.C2.t1(A) (bridge)
null
interface scala.ScalaObject
diff --git a/test/files/run/bug4891/S_1.scala b/test/files/run/bug4891/S_1.scala
index 927c3ad93d..3309d22fbd 100644
--- a/test/files/run/bug4891/S_1.scala
+++ b/test/files/run/bug4891/S_1.scala
@@ -18,7 +18,7 @@ object Bug4891 extends SigTest {
def main(args: Array[String]): Unit = {
show[T1[_]]()
show[C1[_]]()
- show[C2[_]]()
+ show[C2[_]]("m1")
println(classOf[T1[_]].getGenericSuperclass)
classOf[T1[_]].getGenericInterfaces foreach println