summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIulian Dragos <jaguarul@gmail.com>2006-08-02 14:14:04 +0000
committerIulian Dragos <jaguarul@gmail.com>2006-08-02 14:14:04 +0000
commitd16fd45df7b12bdfe6f0625107cb61a7d2900279 (patch)
tree9155d079f0edf842b20afe5a0dbdff1aa6233d98
parente87657e617b1418163dfd4fc49999f13cf154765 (diff)
downloadscala-d16fd45df7b12bdfe6f0625107cb61a7d2900279.tar.gz
scala-d16fd45df7b12bdfe6f0625107cb61a7d2900279.tar.bz2
scala-d16fd45df7b12bdfe6f0625107cb61a7d2900279.zip
Fixed '-debug' check that all basic blocks are ...
Fixed '-debug' check that all basic blocks are visited in a data flow analysis.
-rw-r--r--src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala
index 39fa5d2a32..79cc091f4f 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala
@@ -11,7 +11,7 @@ abstract class TypeFlowAnalysis {
/** The lattice of ICode types.
*/
object typeLattice extends CompleteLattice {
- type Elem = icodes.TypeKind;
+ type Elem = icodes.TypeKind;
val Object = icodes.REFERENCE(global.definitions.ObjectClass);
val All = icodes.REFERENCE(global.definitions.AllClass);
@@ -132,8 +132,8 @@ abstract class TypeFlowAnalysis {
forwardAnalysis(blockTransfer);
if (settings.debug.value) {
linearizer.linearize(method).foreach(b => if (b != method.code.startBlock)
- assert(in(b) != lattice.bottom,
- "Block " + b + " in " + this.method + " has input equal to bottom -- not visited?"));
+ assert(visited.contains(b),
+ "Block " + b + " in " + this.method + " has input equal to bottom -- not visited? .." + visited));
}
}