summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIulian Dragos <jaguarul@gmail.com>2007-05-14 13:21:59 +0000
committerIulian Dragos <jaguarul@gmail.com>2007-05-14 13:21:59 +0000
commit1e07cd182956acff9d5fb6990fe73c9319f30ab1 (patch)
tree9ab059542fe3501ab9924cd176c9dd116d12b7c2
parentbb7d698d97d381f066fa230946eeea989dfd8782 (diff)
downloadscala-1e07cd182956acff9d5fb6990fe73c9319f30ab1.tar.gz
scala-1e07cd182956acff9d5fb6990fe73c9319f30ab1.tar.bz2
scala-1e07cd182956acff9d5fb6990fe73c9319f30ab1.zip
Fixed failing serialization for singletons.
-rw-r--r--src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala2
1 files changed, 1 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 c48bfa8a09..cd7096283f 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
@@ -717,7 +717,7 @@ abstract class GenJVM extends SubComponent {
if (settings.debug.value)
log("genearting LOAD_MODULE for: " + module + " flags: " +
Flags.flagsToString(module.flags));
- if (clasz.symbol == module.moduleClass)
+ if (clasz.symbol == module.moduleClass && jmethod.getName() != nme.readResolve.toString)
jcode.emitALOAD_0()
else
jcode.emitGETSTATIC(javaName(module) /* + "$" */ ,