summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIulian Dragos <jaguarul@gmail.com>2009-05-14 09:49:26 +0000
committerIulian Dragos <jaguarul@gmail.com>2009-05-14 09:49:26 +0000
commitf665c2749c5d355820ae0f7097161ae7e0805b5e (patch)
treedf5338daaa85e95728d9aa0c4eb7aa304ec55558
parent8fa8118e341cc0174d789b508b8b6ebab3571582 (diff)
downloadscala-f665c2749c5d355820ae0f7097161ae7e0805b5e.tar.gz
scala-f665c2749c5d355820ae0f7097161ae7e0805b5e.tar.bz2
scala-f665c2749c5d355820ae0f7097161ae7e0805b5e.zip
Fixed stability issues.
-rw-r--r--lib/fjbg.jar.desired.sha12
-rw-r--r--src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/fjbg.jar.desired.sha1 b/lib/fjbg.jar.desired.sha1
index d6bf323a06..f7bb459d8a 100644
--- a/lib/fjbg.jar.desired.sha1
+++ b/lib/fjbg.jar.desired.sha1
@@ -1 +1 @@
-7f3fa70c5792a945bea5fd1fbad53be0a75541b6 ?fjbg.jar
+3ddd34e6fda096e9624306b9fba8a1ee8e2ba97d ?fjbg.jar
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
index 605c17d0a2..1c0dae7ab8 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
@@ -10,7 +10,7 @@ package scala.tools.nsc.backend.jvm
import java.io.{DataOutputStream, File, OutputStream}
import java.nio.ByteBuffer
-import scala.collection.immutable.Set
+import scala.collection.immutable.{Set, ListSet}
import scala.collection.mutable.{Map, HashMap, HashSet}
import scala.tools.nsc.io.AbstractFile
import scala.tools.nsc.symtab._
@@ -101,7 +101,7 @@ abstract class GenJVM extends SubComponent {
var jmethod: JMethod = _
// var jcode: JExtendedCode = _
- var innerClasses: Set[Symbol] = Set.empty // referenced inner classes
+ var innerClasses: Set[Symbol] = ListSet.empty // referenced inner classes
val fjbgContext = new FJBGContext(49, 0)
@@ -152,7 +152,7 @@ abstract class GenJVM extends SubComponent {
def genClass(c: IClass) {
clasz = c
- innerClasses = Set.empty
+ innerClasses = ListSet.empty
var parents = c.symbol.info.parents
var ifaces = JClass.NO_INTERFACES