summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/backend/icode/ICodes.scala
diff options
context:
space:
mode:
authorIulian Dragos <jaguarul@gmail.com>2006-05-31 10:43:12 +0000
committerIulian Dragos <jaguarul@gmail.com>2006-05-31 10:43:12 +0000
commit213addb673ea0003ea13cb5ec7c402254b29dfc7 (patch)
tree10cf95921ba6b8bc21e7b8f02d42f0d70367eba7 /src/compiler/scala/tools/nsc/backend/icode/ICodes.scala
parent23904f63552d7cb98865d5a07101e2e9795d2ad1 (diff)
downloadscala-213addb673ea0003ea13cb5ec7c402254b29dfc7.tar.gz
scala-213addb673ea0003ea13cb5ec7c402254b29dfc7.tar.bz2
scala-213addb673ea0003ea13cb5ec7c402254b29dfc7.zip
Diffstat (limited to 'src/compiler/scala/tools/nsc/backend/icode/ICodes.scala')
-rw-r--r--src/compiler/scala/tools/nsc/backend/icode/ICodes.scala15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/icode/ICodes.scala b/src/compiler/scala/tools/nsc/backend/icode/ICodes.scala
index 9863b54417..b16e9a9893 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/ICodes.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/ICodes.scala
@@ -11,6 +11,7 @@ import java.io.PrintWriter;
import scala.tools.nsc.symtab._;
import scala.collection.mutable.HashMap;
+import analysis.Liveness;
/** Glue together ICode parts.
*/
@@ -68,16 +69,16 @@ abstract class ICodes extends AnyRef
b.successors.length == 1;
val succ = b.successors.head;
succ.predecessors.length == 1;
- succ.predecessors.head == b
-/* !(m.exh.contains { (e: ExceptionHandler) => e.covers(b) && !e.covers(succ) }) */) {
- Console.println("Block " + b + ".lastInstruction" + b.lastInstruction);
- Console.println(" has successors: " + b.successors + " and succ has pred: " + succ.predecessors);
- //yield Pair(b, succ)
- }
-// Console.println("Mergeable: " + mergeablePairs.mkString("", "\n", ""));
+ succ.predecessors.head == b;
+ !(m.exh.contains { (e: ExceptionHandler) => e.covers(b) && !e.covers(succ) }))
+ yield Pair(b, succ)
()
}
+ object liveness extends Liveness {
+ val global: ICodes.this.global.type = ICodes.this.global;
+ }
+
def init = { }
}