summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIulian Dragos <jaguarul@gmail.com>2009-04-14 16:13:39 +0000
committerIulian Dragos <jaguarul@gmail.com>2009-04-14 16:13:39 +0000
commitedd75ec2e592182d28527e6bbd960f0683dd4a02 (patch)
treed4863988ebac359b3ba6f41020e3b8b7bc842886
parentb506be5a87c6ecea7d2c8797b257051e8c2106fa (diff)
downloadscala-edd75ec2e592182d28527e6bbd960f0683dd4a02.tar.gz
scala-edd75ec2e592182d28527e6bbd960f0683dd4a02.tar.bz2
scala-edd75ec2e592182d28527e6bbd960f0683dd4a02.zip
Fixed #1882
-rw-r--r--src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
index 744e36b452..466e0068b8 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
@@ -406,8 +406,9 @@ abstract class GenJVM extends SubComponent {
}
def addGenericSignature(jmember: JMember, sym: Symbol) {
- if (!sym.hasFlag(Flags.LIFTED | Flags.PRIVATE |
- Flags.EXPANDEDNAME | Flags.SYNTHETIC) && settings.target.value == "jvm-1.5") {
+ if (settings.target.value == "jvm-1.5"
+ && !sym.hasFlag(Flags.EXPANDEDNAME | Flags.SYNTHETIC)
+ && !(sym.isMethod && sym.hasFlag(Flags.LIFTED))) {
erasure.javaSig(sym) match {
case Some(sig) =>
val index = jmember.getConstantPool().addUtf8(sig).toShort