diff options
| author | Martin Odersky <odersky@gmail.com> | 2016-06-29 19:09:43 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2016-07-11 13:34:59 +0200 |
| commit | 4bf43f82c88dbeb0578e289b37ce1a7580aa22f2 (patch) | |
| tree | 41c4483ffcf4e93e8d19f4ec89206a848738eb08 /src/dotty/tools/dotc/ast/Desugar.scala | |
| parent | 178e90e441481364f19163a9dad624a4d859fb1b (diff) | |
| download | dotty-4bf43f82c88dbeb0578e289b37ce1a7580aa22f2.tar.gz dotty-4bf43f82c88dbeb0578e289b37ce1a7580aa22f2.tar.bz2 dotty-4bf43f82c88dbeb0578e289b37ce1a7580aa22f2.zip | |
Turn on new hk scheme
For the moment under newHK flag.
- avoid crasher in derivedTypeParams (NamedTypes don't always have symbols)
- Revise logic in type comparer for new HK scheme
Diffstat (limited to 'src/dotty/tools/dotc/ast/Desugar.scala')
| -rw-r--r-- | src/dotty/tools/dotc/ast/Desugar.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/ast/Desugar.scala b/src/dotty/tools/dotc/ast/Desugar.scala index f603f6817..a9705e209 100644 --- a/src/dotty/tools/dotc/ast/Desugar.scala +++ b/src/dotty/tools/dotc/ast/Desugar.scala @@ -66,7 +66,7 @@ object desugar { val relocate = new TypeMap { val originalOwner = sym.owner def apply(tp: Type) = tp match { - case tp: NamedType if tp.symbol.owner eq originalOwner => + case tp: NamedType if tp.symbol.exists && (tp.symbol.owner eq originalOwner) => val defctx = ctx.outersIterator.dropWhile(_.scope eq ctx.scope).next var local = defctx.denotNamed(tp.name).suchThat(_ is ParamOrAccessor).symbol if (local.exists) (defctx.owner.thisType select local).dealias |