summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2009-02-27 18:54:41 +0000
committerPaul Phillips <paulp@improving.org>2009-02-27 18:54:41 +0000
commitb4cd4a89db0075508ae5ee0ecdb5da177782ede0 (patch)
tree063a01f627b1917667283199127683581331d0f8 /src
parent174a9a70594963a6f84917d81d85bf1954c05fdc (diff)
downloadscala-b4cd4a89db0075508ae5ee0ecdb5da177782ede0.tar.gz
scala-b4cd4a89db0075508ae5ee0ecdb5da177782ede0.tar.bz2
scala-b4cd4a89db0075508ae5ee0ecdb5da177782ede0.zip
Fix for #1745 - only emit generic signature if ...
Fix for #1745 - only emit generic signature if method is not deferred.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
index 9df15b85e9..4dc08eedc0 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
@@ -712,7 +712,10 @@ abstract class GenJVM extends SubComponent {
mirrorCode.emitRETURN(mirrorMethod.getReturnType())
addRemoteException(mirrorMethod, m)
- // addGenericSignature(mirrorMethod, m)
+ // only add generic signature if the method is concrete; bug #1745
+ if (!m.hasFlag(Flags.DEFERRED))
+ addGenericSignature(mirrorMethod, m)
+
val (throws, others) = splitAnnotations(m.attributes, ThrowsAttr)
addExceptionsAttribute(mirrorMethod, throws)
addAnnotations(mirrorMethod, others)