diff options
| author | Martin Odersky <odersky@gmail.com> | 2014-10-19 15:32:30 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2014-10-26 16:24:01 +0100 |
| commit | 0f3a903bebdac5eeaa84b2f8fdd0298bd15468f2 (patch) | |
| tree | baad7c679295ffa079e11be30f7a8650720a12ad /src/dotty/tools/dotc/core/Types.scala | |
| parent | 8b38acbd349a033ba29285397fb54530a25e16e0 (diff) | |
| download | dotty-0f3a903bebdac5eeaa84b2f8fdd0298bd15468f2.tar.gz dotty-0f3a903bebdac5eeaa84b2f8fdd0298bd15468f2.tar.bz2 dotty-0f3a903bebdac5eeaa84b2f8fdd0298bd15468f2.zip | |
TreeTypeMap needs to map declarations of mapped classes
... and these mappings have to be part of the applied substitutions.
Without the patch, the postCondition of FirstTransform fails for TreeInfo.scala and others,
because it selects symbols which are not defined in the mapped class.
Unrelated bugfix: JavaArray derives from Object.
Diffstat (limited to 'src/dotty/tools/dotc/core/Types.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/Types.scala | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/dotty/tools/dotc/core/Types.scala b/src/dotty/tools/dotc/core/Types.scala index d93e4eb09..33ce71ad3 100644 --- a/src/dotty/tools/dotc/core/Types.scala +++ b/src/dotty/tools/dotc/core/Types.scala @@ -116,6 +116,8 @@ object Types { tp.tp1.derivesFrom(cls) || tp.tp2.derivesFrom(cls) case tp: OrType => tp.tp1.derivesFrom(cls) && tp.tp2.derivesFrom(cls) + case tp: JavaArrayType => + cls == defn.ObjectClass case _ => false } |