diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2012-04-21 19:29:53 +0200 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2012-04-21 19:33:19 +0200 |
| commit | 1dba0583fabb55757ba141d399bb3e492e358c17 (patch) | |
| tree | b0b8d8a4430e2be78b3ce51a9cf979d115a0356c /src/compiler | |
| parent | 3c9c18ddccc17c2b0e62195315ba2abb72d3b761 (diff) | |
| download | scala-1dba0583fabb55757ba141d399bb3e492e358c17.tar.gz scala-1dba0583fabb55757ba141d399bb3e492e358c17.tar.bz2 scala-1dba0583fabb55757ba141d399bb3e492e358c17.zip | |
fixes SI-5689
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Macros.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Macros.scala b/src/compiler/scala/tools/nsc/typechecker/Macros.scala index cbfa61470c..9b4dd09c98 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Macros.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Macros.scala @@ -427,7 +427,7 @@ trait Macros { self: Analyzer => var actparamss = macroImpl.paramss actparamss = transformTypeTagEvidenceParams(actparamss, (param, tparam) => None) - val rettpe = if (ddef.tpt.tpe != null) ddef.tpt.tpe else computeMacroDefTypeFromMacroImpl(ddef, macroDef, macroImpl) + val rettpe = if (!ddef.tpt.isEmpty) typer.typedType(ddef.tpt).tpe else computeMacroDefTypeFromMacroImpl(ddef, macroDef, macroImpl) val (reqparamsss0, reqres0) = macroImplSigs(macroDef, ddef.tparams, ddef.vparamss, rettpe) var reqparamsss = reqparamsss0 |