diff options
| author | odersky <odersky@gmail.com> | 2016-02-19 18:09:31 +0100 |
|---|---|---|
| committer | odersky <odersky@gmail.com> | 2016-02-19 18:09:31 +0100 |
| commit | dfa3ec849ff62f682092c450129e78d43829bde3 (patch) | |
| tree | f6b812c0ae5995740bff6c04f0995b23db45d4dc /src/dotty/tools/dotc/typer/TypeAssigner.scala | |
| parent | 2217a4ec9ea563f01b07c852a3834d738cd6439d (diff) | |
| parent | 6f382a51a522673de75d154da2632108e7a1016c (diff) | |
| download | dotty-dfa3ec849ff62f682092c450129e78d43829bde3.tar.gz dotty-dfa3ec849ff62f682092c450129e78d43829bde3.tar.bz2 dotty-dfa3ec849ff62f682092c450129e78d43829bde3.zip | |
Merge pull request #1066 from dotty-staging/fix-#997
Fix #997
Diffstat (limited to 'src/dotty/tools/dotc/typer/TypeAssigner.scala')
| -rw-r--r-- | src/dotty/tools/dotc/typer/TypeAssigner.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/typer/TypeAssigner.scala b/src/dotty/tools/dotc/typer/TypeAssigner.scala index fd4f0011c..476839ab3 100644 --- a/src/dotty/tools/dotc/typer/TypeAssigner.scala +++ b/src/dotty/tools/dotc/typer/TypeAssigner.scala @@ -71,7 +71,7 @@ trait TypeAssigner { if (tp1.typeSymbol.exists) return tp1 } - val parentType = info.instantiatedParents.reduceLeft(ctx.typeComparer.andType(_, _)) + val parentType = info.parentsWithArgs.reduceLeft(ctx.typeComparer.andType(_, _)) def addRefinement(parent: Type, decl: Symbol) = { val inherited = parentType.findMember(decl.name, info.cls.thisType, Private) @@ -292,7 +292,7 @@ trait TypeAssigner { else if (!mix.isEmpty) findMixinSuper(cls.info) else if (inConstrCall || ctx.erasedTypes) cls.info.firstParent else { - val ps = cls.classInfo.instantiatedParents + val ps = cls.classInfo.parentsWithArgs if (ps.isEmpty) defn.AnyType else ps.reduceLeft((x: Type, y: Type) => x & y) } tree.withType(SuperType(cls.thisType, owntype)) |