summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGilles Dubochet <gilles.dubochet@epfl.ch>2010-03-29 13:14:10 +0000
committerGilles Dubochet <gilles.dubochet@epfl.ch>2010-03-29 13:14:10 +0000
commitc72f823f16f6d3745299447a82629fa59d2f31d9 (patch)
tree0772c7b9e9ea8c3a6c779440676b6e3fc93801dd /src
parent97515089566b5f138d3a5cb73769d54178d210d4 (diff)
downloadscala-c72f823f16f6d3745299447a82629fa59d2f31d9.tar.gz
scala-c72f823f16f6d3745299447a82629fa59d2f31d9.tar.bz2
scala-c72f823f16f6d3745299447a82629fa59d2f31d9.zip
Reverted file that was unintentionally committe...
Reverted file that was unintentionally committed as part of r21294.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala4
1 files changed, 2 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 e2a61fddd0..d093f5c1c9 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
@@ -18,7 +18,7 @@ import scala.tools.nsc.symtab.classfile.ClassfileConstants._
import ch.epfl.lamp.fjbg._
import java.io.{ByteArrayOutputStream, DataOutputStream, File, OutputStream}
-import scala.reflect.generic.{PickleFormat, PickleBuffer}
+import reflect.generic.{PickleFormat, PickleBuffer}
/** This class ...
*
@@ -908,7 +908,7 @@ abstract class GenJVM extends SubComponent {
JClass.NO_INTERFACES,
sourceFile)
addForwarders(mirrorClass, clasz)
- val ssa = scalaSignatureAddingMarker(mirrorClass, clasz)
+ val ssa = scalaSignatureAddingMarker(mirrorClass, clasz.companionSymbol)
addAnnotations(mirrorClass, clasz.annotations ++ ssa)
emitClass(mirrorClass, clasz)
}