Merge pull request #622 from dotty-staging/add/implement-scala2-traits

Implement Scala2 traits

1 files changed, 8 insertions, 2 deletions

diff --git a/tests/run/t6534.scala b/tests/run/t6534.scala
index 33df97e41..b5789f52c 100644
--- a/tests/run/t6534.scala
+++ b/tests/run/t6534.scala
@@ -8,7 +8,13 @@ object Test {
   def main(args: Array[String]): Unit = {
     val b1 = new Bippy1(71)
     val b2 = new Bippy2(71)
-    assert(b1 == b1 && b1.## == b1.x.##, ((b1, b1.##)))
-    assert(b2 == b2 && b2.## == b2.x.##, ((b2, b2.##)))
+    assert(b1 == b1)
+    assert(b1.## == b1.x.##, "hash differs1 " + ((b1, b1.##)))
+    assert(b2 == b2)
+    // assert(b2.## == b2.x.##, "hash differs2 " + ((b2, b2.##, b2.x.##)))
+    // Disabled, this does not hold. Because the value class inherits
+    // a different hashCode, no code is generated for it. Replaced by:
+    assert(b2.## == -1)
+    assert(!b1.equals(b1))
   }
 }