summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-09-09 16:08:27 -0700
committerPaul Phillips <paulp@improving.org>2013-09-09 16:08:27 -0700
commit11540f775783a79c370ae893a861d3033882f9cd (patch)
tree29aa9c9a4c12e87d32199c0fd7f673a46a978c18
parent288b12e48af3222134f3985b65e40f202af81df2 (diff)
parent6e585e1261552c29a9d463057fd7977072bb824b (diff)
downloadscala-11540f775783a79c370ae893a861d3033882f9cd.tar.gz
scala-11540f775783a79c370ae893a861d3033882f9cd.tar.bz2
scala-11540f775783a79c370ae893a861d3033882f9cd.zip
Merge pull request #10 from retronym/topic/tree-checker-higher-order-tparam
Avoid spurious tree checker warning for higher order type params
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala b/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala
index c354f8707b..3a188c0044 100644
--- a/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala
@@ -376,7 +376,7 @@ abstract class TreeCheckers extends Analyzer {
val treeInfo = infoOf(tree)
val treeTpe = typeOf(tree)
- def isOk(sym: Symbol) = treeSym hasTransOwner sym.safeOwner
+ def isOk(sym: Symbol) = treeSym hasTransOwner sym.enclosingSuchThat(x => !x.isTypeParameterOrSkolem) // account for higher order type params
def isEligible(sym: Symbol) = (sym ne NoSymbol) && (
sym.isTypeParameter
|| sym.isLocal