summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-03-20 05:24:23 +0000
committerPaul Phillips <paulp@improving.org>2011-03-20 05:24:23 +0000
commita30ae005c5965fa65d05b16718e50c802d969312 (patch)
tree198a07e1ea14fcfc773a9571d1fe57815599a6de /src
parent36ac83da7fb1556416fc4c5e86ceac69adefc6c8 (diff)
downloadscala-a30ae005c5965fa65d05b16718e50c802d969312.tar.gz
scala-a30ae005c5965fa65d05b16718e50c802d969312.tar.bz2
scala-a30ae005c5965fa65d05b16718e50c802d969312.zip
Restored erasure warning for isInstanceOf tests.
no review.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Infer.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Infer.scala b/src/compiler/scala/tools/nsc/typechecker/Infer.scala
index e15c8fae66..296e555559 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Infer.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Infer.scala
@@ -1312,7 +1312,7 @@ trait Infer {
((bound contains sym) ||
sym.name == tpnme.WILDCARD || {
val e = context.scope.lookupEntry(sym.name)
- (e ne null) && e.sym == sym && e.owner == context.scope
+ (e ne null) && e.sym == sym && !e.sym.isTypeParameterOrSkolem && e.owner == context.scope
})
tp match {
case SingleType(pre, _) =>