summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-01-17 10:05:15 -0800
committerPaul Phillips <paulp@improving.org>2012-01-17 10:05:15 -0800
commitcc9871f8dd4f685660976f1a6e5e07c28a4c53a7 (patch)
tree56d4ed9067cb502083fa4017952b323cfd3bb897 /src
parent9d55bf45cd13107ad8f3e5e75737f37e75b22f90 (diff)
parent1591c14e504246d2cb49b1f7f3e00f6d986f6a06 (diff)
downloadscala-cc9871f8dd4f685660976f1a6e5e07c28a4c53a7.tar.gz
scala-cc9871f8dd4f685660976f1a6e5e07c28a4c53a7.tar.bz2
scala-cc9871f8dd4f685660976f1a6e5e07c28a4c53a7.zip
Merge branch 'specialized/hlist' of https://github.com/dragos/scala into develop
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
index 85c3a77dcb..fd826fb6d8 100644
--- a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
+++ b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
@@ -1258,7 +1258,10 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers {
.format(tree, symbol.tpe, tree.tpe, env, specializedName(symbol, env)))
if (!env.isEmpty) { // a method?
val specCandidates = qual.tpe.member(specializedName(symbol, env))
- val specMember = specCandidates suchThat (s => doesConform(symbol, tree.tpe, s.tpe, env))
+ val specMember = specCandidates suchThat { s =>
+ doesConform(symbol, tree.tpe, qual.tpe.memberType(s), env)
+ }
+
log("[specSym] found: " + specCandidates.tpe + ", instantiated as: " + tree.tpe)
log("[specSym] found specMember: " + specMember)
if (specMember ne NoSymbol)