diff options
| author | Paul Phillips <paulp@improving.org> | 2010-10-06 22:56:21 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-10-06 22:56:21 +0000 |
| commit | b8c07db737b55a2ce34190b17013215dc13940ae (patch) | |
| tree | 0d547968dcf9f011b71ccd822809920f83707536 /src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala | |
| parent | f647966e8e2475cbd0498a3304bca04883424eff (diff) | |
| download | scala-b8c07db737b55a2ce34190b17013215dc13940ae.tar.gz scala-b8c07db737b55a2ce34190b17013215dc13940ae.tar.bz2 scala-b8c07db737b55a2ce34190b17013215dc13940ae.zip | |
An obviously wrong yet somehow brilliant piece ...
An obviously wrong yet somehow brilliant piece of code uncommenting.
References #2171 without fixing it. Removes the non-termination which
had caused me to revert r23174, which itself immediately follows this
patch. No review (but iulian says he will look at this situation
somewhere down the line.)
Diffstat (limited to 'src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala index 19cbeaa0ec..98d9081624 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala @@ -73,7 +73,7 @@ trait DataFlowAnalysis[L <: SemiLattice] { assert(false, "Invalid successor for: " + point + " successor " + p + " does not exist") // if (!p.exceptionHandlerHeader) { // println("lubbing " + p.predecessors + " outs: " + p.predecessors.map(out.apply).mkString("\n", "\n", "")) - in(p) = lattice.lub(/*in(p) :: */(p.predecessors map out.apply), p.exceptionHandlerStart) + in(p) = lattice.lub(in(p) :: (p.predecessors map out.apply), p.exceptionHandlerStart) // } } } |