aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2015-06-07 18:26:43 +0200
committerMartin Odersky <odersky@gmail.com>2015-06-07 18:26:53 +0200
commit5733fdbd3ed3e8036992ee690bbd8270a36471a2 (patch)
treef5e86a799c19feed6a7d7c4efd7e9b23ee5ebaae /tests
parentcb2d81df7ef98e79874bf74227045a64ce86e75f (diff)
downloaddotty-5733fdbd3ed3e8036992ee690bbd8270a36471a2.tar.gz
dotty-5733fdbd3ed3e8036992ee690bbd8270a36471a2.tar.bz2
dotty-5733fdbd3ed3e8036992ee690bbd8270a36471a2.zip
Fix mergeDenot one more time.
It's easy to get this wrong. What happened was that when computing deferred members of a class a deferred member was preferred over a concrete one because the types did not match. Thsi should not happen. We now change the scheme to always prefer concrete over abstract, and subclass-owned over superclass-owned. But we pick a denotation only if the overrides relationship on types coincides with the preference on symbols.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/pos/t2503.scala (renamed from tests/disabled/t2503.scala)0
-rw-r--r--tests/pos/t5577.scala (renamed from tests/disabled/t5577.scala)0
2 files changed, 0 insertions, 0 deletions
diff --git a/tests/disabled/t2503.scala b/tests/pos/t2503.scala
index d0983f2ca..d0983f2ca 100755
--- a/tests/disabled/t2503.scala
+++ b/tests/pos/t2503.scala
diff --git a/tests/disabled/t5577.scala b/tests/pos/t5577.scala
index d54a37e45..d54a37e45 100644
--- a/tests/disabled/t5577.scala
+++ b/tests/pos/t5577.scala