diff options
| author | Paul Phillips <paulp@improving.org> | 2012-01-30 11:01:04 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-01-30 11:01:04 -0800 |
| commit | 84fd439fb1c2f08439e539aea4f9657c6768bc83 (patch) | |
| tree | b8c6d5348bc297c4fdb3e2d28a4a6e1a439c5732 /src/compiler | |
| parent | a4d6992280b179295142f2f7c7d138ec7f08039b (diff) | |
| parent | bf2ec290d9bf1a75daa0f56081a99dc2f69e2670 (diff) | |
| download | scala-84fd439fb1c2f08439e539aea4f9657c6768bc83.tar.gz scala-84fd439fb1c2f08439e539aea4f9657c6768bc83.tar.bz2 scala-84fd439fb1c2f08439e539aea4f9657c6768bc83.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 770b55d6ab..d3ff331f98 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -793,7 +793,7 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser { val tree0 = etaExpand(context.unit, tree) // println("eta "+tree+" ---> "+tree0+":"+tree0.tpe+" undet: "+context.undetparams+ " mode: "+Integer.toHexString(mode)) - if (meth.typeParams.nonEmpty) { + if (context.undetparams.nonEmpty) { // #2624: need to infer type arguments for eta expansion of a polymorphic method // context.undetparams contains clones of meth.typeParams (fresh ones were generated in etaExpand) // need to run typer on tree0, since etaExpansion sets the tpe's of its subtrees to null |