diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-02-18 10:40:59 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-02-18 10:40:59 -0800 |
| commit | b4a39d826f2f19c8d34e0ff245ff485e7eec04c9 (patch) | |
| tree | ea5083e0d91bee528ec4ec2e6424cb9f89f86e0d /src | |
| parent | 2a00f01ae3f8eaf2e076e36a2236b919169005dd (diff) | |
| parent | 4f4ee871c9f57d94bc954a5d372736849edb7901 (diff) | |
| download | scala-b4a39d826f2f19c8d34e0ff245ff485e7eec04c9.tar.gz scala-b4a39d826f2f19c8d34e0ff245ff485e7eec04c9.tar.bz2 scala-b4a39d826f2f19c8d34e0ff245ff485e7eec04c9.zip | |
Merge pull request #3550 from retronym/ticket/7932
SI-7932 Exclude PolyTypes from Java generic signatures
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Erasure.scala | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Erasure.scala b/src/compiler/scala/tools/nsc/transform/Erasure.scala index 60c1553ef3..4db74e70f2 100644 --- a/src/compiler/scala/tools/nsc/transform/Erasure.scala +++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala @@ -238,8 +238,11 @@ abstract class Erasure extends AddInterfaces if (!(AnyRefTpe <:< bounds.hi)) "+" + boxedSig(bounds.hi) else if (!(bounds.lo <:< NullTpe)) "-" + boxedSig(bounds.lo) else "*" - } else { - boxedSig(tp) + } else tp match { + case PolyType(_, res) => + "*" // SI-7932 + case _ => + boxedSig(tp) } def classSig = { val preRebound = pre.baseType(sym.owner) // #2585 |