- bug fix: moved outerMap to the phase (descrip...

- bug fix: moved outerMap to the phase (descriptor) so that it is
preserved during recompilations

2 files changed, 6 insertions, 1 deletions

diff --git a/sources/scalac/transformer/ExplicitOuterClasses.java b/sources/scalac/transformer/ExplicitOuterClasses.java
index aa6a0a4c08..283da9d24c 100644
--- a/sources/scalac/transformer/ExplicitOuterClasses.java
+++ b/sources/scalac/transformer/ExplicitOuterClasses.java
@@ -28,10 +28,11 @@ import Tree.*;
 
 public class ExplicitOuterClasses extends Transformer {
     // Mapping from class constructor symbols to owner field symbols.
-    protected HashMap/*<Symbol,Symbol>*/ outerMap = new HashMap();
+    protected HashMap/*<Symbol,Symbol>*/ outerMap;
 
     public ExplicitOuterClasses(Global global) {
         super(global);
+        outerMap = global.PHASE.EXPLICITOUTER.outerMap;
     }
 
     protected Type addValueParam(Type oldType, Symbol newValueParam) {
diff --git a/sources/scalac/transformer/ExplicitOuterClassesPhase.java b/sources/scalac/transformer/ExplicitOuterClassesPhase.java
index bca4b9a277..c7db77f0ff 100644
--- a/sources/scalac/transformer/ExplicitOuterClassesPhase.java
+++ b/sources/scalac/transformer/ExplicitOuterClassesPhase.java
@@ -11,8 +11,12 @@ package scalac.transformer;
 
 import scalac.*;
 import scalac.checkers.*;
+import java.util.HashMap;
 
 public class ExplicitOuterClassesPhase extends PhaseDescriptor {
+    // Mapping from class constructor symbols to owner field symbols.
+    public HashMap/*<Symbol,Symbol>*/ outerMap = new HashMap();
+
     public String name () {
         return "explicitouterclasses";
     }