diff options
| author | Paul Phillips <paulp@improving.org> | 2012-05-09 15:13:09 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-05-09 16:07:35 -0700 |
| commit | 09f380dbda56abdfbdda0cab51bc7187eb70b516 (patch) | |
| tree | 91058c6990817313b9e25503af0b36f4ad5efbda /src/compiler/scala/tools/nsc/typechecker/Namers.scala | |
| parent | 1cd498f9091504b42030d4b81c6f659bc386115f (diff) | |
| download | scala-09f380dbda56abdfbdda0cab51bc7187eb70b516.tar.gz scala-09f380dbda56abdfbdda0cab51bc7187eb70b516.tar.bz2 scala-09f380dbda56abdfbdda0cab51bc7187eb70b516.zip | |
Fix an inference regression with this.type.
Closes SI-5210.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Namers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Namers.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala index 063db4bb88..ca4b1d3de8 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -787,8 +787,8 @@ trait Namers extends MethodSynthesis { val typedBody = if (tree.symbol.isTermMacro) defnTyper.computeMacroDefType(tree, pt) else defnTyper.computeType(tree.rhs, pt) - val sym = if (owner.isMethod) owner else tree.symbol - val typedDefn = widenIfNecessary(sym, typedBody, pt) + + val typedDefn = widenIfNecessary(tree.symbol, typedBody, pt) assignTypeToTree(tree, typedDefn) } |