Fixed several bugs in Inliners and the monitor ...

Fixed several bugs in Inliners and the monitor crash in jvm.

1 files changed, 8 insertions, 2 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 c2e1169f0b..91b4ee4e68 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala
@@ -103,9 +103,10 @@ abstract class TypeFlowAnalysis {
     val STRING = icodes.REFERENCE(TypeFlowAnalysis.this.global.definitions.StringClass);
     var method: IMethod = _;
 
-    def this(m: icodes.IMethod) = {
-      this();
+    /** Initialize the in/out maps for the analysis of the given method. */
+    def init(m: icodes.IMethod): Unit = {
       this.method = m;
+
       init {
         worklist += m.code.startBlock;
         worklist ++= (m.exh map (.startBlock));
@@ -122,6 +123,11 @@ abstract class TypeFlowAnalysis {
       }
     }
 
+    def this(m: icodes.IMethod) = {
+      this();
+      init(m)
+    }
+
     def run = {
       forwardAnalysis(blockTransfer);
       if (settings.debug.value) {