diff options
| author | odersky <odersky@gmail.com> | 2015-11-16 17:09:21 +0100 |
|---|---|---|
| committer | odersky <odersky@gmail.com> | 2015-11-16 17:09:21 +0100 |
| commit | 6b061b5b94fb4e13a97274b28e0ab9ac78b69f27 (patch) | |
| tree | 804bfa1bec8c0a5419b81f593db3a75f76cf493e /src/dotty/tools/dotc/core | |
| parent | 08b53243bfaadaf8fd590bf0a30a5dfa667ca38e (diff) | |
| parent | 2c187400ba7f88ccca5d805054ee06bab4cdcd25 (diff) | |
| download | dotty-6b061b5b94fb4e13a97274b28e0ab9ac78b69f27.tar.gz dotty-6b061b5b94fb4e13a97274b28e0ab9ac78b69f27.tar.bz2 dotty-6b061b5b94fb4e13a97274b28e0ab9ac78b69f27.zip | |
Merge pull request #960 from dotty-staging/fix-#941
Fix #941
Diffstat (limited to 'src/dotty/tools/dotc/core')
| -rw-r--r-- | src/dotty/tools/dotc/core/Denotations.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/core/Denotations.scala b/src/dotty/tools/dotc/core/Denotations.scala index 666908fab..b6519e1cd 100644 --- a/src/dotty/tools/dotc/core/Denotations.scala +++ b/src/dotty/tools/dotc/core/Denotations.scala @@ -320,7 +320,7 @@ object Denotations { try info1 & info2 catch { case ex: MergeError => - if (pre.widen.classSymbol.is(Scala2x)) + if (pre.widen.classSymbol.is(Scala2x) || ctx.scala2Mode) info1 // follow Scala2 linearization - // compare with way merge is performed in SymDenotation#computeMembersNamed else |