diff options
| author | Martin Odersky <odersky@gmail.com> | 2014-07-16 16:04:14 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2014-07-17 11:02:03 +0200 |
| commit | 37c6e42cfd04c62c504a9143cb2cc4b500baf38b (patch) | |
| tree | fffdafaaa27501c49ce40512b7f3b79ba485f4f1 /src | |
| parent | ace968dabf8e02f725f7b77cde90f64988a7b326 (diff) | |
| download | dotty-37c6e42cfd04c62c504a9143cb2cc4b500baf38b.tar.gz dotty-37c6e42cfd04c62c504a9143cb2cc4b500baf38b.tar.bz2 dotty-37c6e42cfd04c62c504a9143cb2cc4b500baf38b.zip | |
Fixed problem with missing denotations in polyDefDef
Problem was reported by @darkdimius. Test case will come in next commit.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dotty/tools/dotc/core/Symbols.scala | 4 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/typer/Applications.scala | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/core/Symbols.scala b/src/dotty/tools/dotc/core/Symbols.scala index ab083a128..1767d7c0c 100644 --- a/src/dotty/tools/dotc/core/Symbols.scala +++ b/src/dotty/tools/dotc/core/Symbols.scala @@ -357,6 +357,10 @@ object Symbols { final def asType(implicit ctx: Context): TypeSymbol = { assert(isType, s"isType called on not-a-Type $this"); asInstanceOf[TypeSymbol] } final def asClass: ClassSymbol = asInstanceOf[ClassSymbol] + /** Special cased here, because it may be used on naked symbols in substituters */ + final def isStatic(implicit ctx: Context): Boolean = + lastDenot != null && denot.isStatic + /** A unique, densely packed integer tag for each class symbol, -1 * for all other symbols. To save memory, this method * should be called only if class is a super class of some other class. diff --git a/src/dotty/tools/dotc/typer/Applications.scala b/src/dotty/tools/dotc/typer/Applications.scala index 99bb82844..242985b57 100644 --- a/src/dotty/tools/dotc/typer/Applications.scala +++ b/src/dotty/tools/dotc/typer/Applications.scala @@ -767,8 +767,7 @@ trait Applications extends Compatibility { self: Typer => */ def isAsSpecific(alt1: TermRef, tp1: Type, alt2: TermRef, tp2: Type): Boolean = ctx.traceIndented(i"isAsSpecific $tp1 $tp2", overload) { tp1 match { case tp1: PolyType => - def bounds(tparamRefs: List[TypeRef]) = tp1.paramBounds map (_.substParams(tp1, tparamRefs)) - val tparams = ctx.newTypeParams(alt1.symbol, tp1.paramNames, EmptyFlags, bounds) + val tparams = ctx.newTypeParams(alt1.symbol, tp1.paramNames, EmptyFlags, tp1.instantiateBounds) isAsSpecific(alt1, tp1.instantiate(tparams map (_.typeRef)), alt2, tp2) case tp1: MethodType => def repeatedToSingle(tp: Type) = if (tp.isRepeatedParam) tp.argTypesHi.head else tp |