diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-01-15 00:01:17 -0800 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-01-15 00:01:17 -0800 |
| commit | b3ad7534fb99df9ea0a64e4ba929311c72175709 (patch) | |
| tree | 0b498520a8337089421bcd63df979184e94df18c /src/compiler | |
| parent | d5801b9eee7df49894c05dea430a56190cae2112 (diff) | |
| parent | 9df2dcc58439cf75420da68d4e6d9bb5504aabb4 (diff) | |
| download | scala-b3ad7534fb99df9ea0a64e4ba929311c72175709.tar.gz scala-b3ad7534fb99df9ea0a64e4ba929311c72175709.tar.bz2 scala-b3ad7534fb99df9ea0a64e4ba929311c72175709.zip | |
Merge pull request #3364 from retronym/ticket/8152
[nomaster] Backport variance validator performance fix
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala index 081f7a8696..fea234dd14 100644 --- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala +++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala @@ -909,11 +909,13 @@ abstract class RefChecks extends InfoTransform with scala.reflect.internal.trans // case DeBruijnIndex(_, _) => case SingleType(pre, sym) => validateVariance(pre, variance) + case TypeRef(_, sym, _) if sym.isAliasType => + // okay to ignore pre/args here. In 2.10.3 we used to check them in addition to checking + // the normalized type, which led to exponential time type checking, see pos/t8152-performance.scala + validateVariance(tp.normalize, variance) case TypeRef(pre, sym, args) => // println("validate "+sym+" at "+relativeVariance(sym)) - if (sym.isAliasType/* && relativeVariance(sym) == AnyVariance*/) - validateVariance(tp.normalize, variance) - else if (sym.variance != NoVariance) { + if (sym.variance != NoVariance) { val v = relativeVariance(sym) if (v != AnyVariance && sym.variance != v * variance) { //Console.println("relativeVariance(" + base + "," + sym + ") = " + v);//DEBUG |