summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSom Snytt <som.snytt@gmail.com>2012-05-22 01:42:50 -0700
committerSom Snytt <som.snytt@gmail.com>2012-05-22 01:47:54 -0700
commit8de2caa560d2c820269fd30207fdd22dd7e48c6b (patch)
tree2be0614bacc4ef67303bbf0bee04999464ff26c1 /src
parentf6a4d945698bac9b64a2d2ddaf44eb7302336670 (diff)
downloadscala-8de2caa560d2c820269fd30207fdd22dd7e48c6b.tar.gz
scala-8de2caa560d2c820269fd30207fdd22dd7e48c6b.tar.bz2
scala-8de2caa560d2c820269fd30207fdd22dd7e48c6b.zip
SI-3761: Overload resolution fails on by-name parameter (amended per lrytz)
Lukas noted the stopgap at methTypeArgs isn't needed. What! No black tie formals.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Infer.scala3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Infer.scala b/src/compiler/scala/tools/nsc/typechecker/Infer.scala
index 34b951a797..f902198dda 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Infer.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Infer.scala
@@ -694,8 +694,7 @@ trait Infer {
isCompatibleArgs(argtpes, formals) && isWeaklyCompatible(restpe, pt)
} else {
try {
- val blackTie = formalTypes(params map { _.tpe }, argtpes0.length)
- val AdjustedTypeArgs.Undets(okparams, okargs, leftUndet) = methTypeArgs(undetparams, blackTie, restpe, argtpes, pt)
+ val AdjustedTypeArgs.Undets(okparams, okargs, leftUndet) = methTypeArgs(undetparams, formals, restpe, argtpes, pt)
// #2665: must use weak conformance, not regular one (follow the monomorphic case above)
(exprTypeArgs(leftUndet, restpe.instantiateTypeParams(okparams, okargs), pt, useWeaklyCompatible = true)._1 ne null) &&
isWithinBounds(NoPrefix, NoSymbol, okparams, okargs)