- added AddConstructors and GenJVM phases

2 files changed, 8 insertions, 8 deletions

diff --git a/sources/scalac/Global.java b/sources/scalac/Global.java
index e7ea1e9d27..33cd9e3010 100644
--- a/sources/scalac/Global.java
+++ b/sources/scalac/Global.java
@@ -187,14 +187,14 @@ public class  Global {
         phases.add(PHASE.ADDINTERFACES);
         phases.add(PHASE.EXPANDMIXIN);
         phases.add(PHASE.ERASURE);
-	/*
 	if (target == TARGET_INT || target == TARGET_MSIL || target == TARGET_JVM) {
             phases.add(PHASE.ADDCONSTRUCTORS);
         }
+	/*
         if (target == TARGET_JAVA) phases.add(PHASE.GENJAVA);
         if (target == TARGET_MSIL) phases.add(PHASE.GENMSIL);
-        if (target == TARGET_JVM) phases.add(PHASE.GENJVM);
 	*/
+        if (target == TARGET_JVM) phases.add(PHASE.GENJVM);
         phases.add(PHASE.TERMINAL);
         this.phases = new PhaseDescriptor[phases.size()];
         for (int i = 0; i < phases.size(); i++) {
diff --git a/sources/scalac/PhaseRepository.java b/sources/scalac/PhaseRepository.java
index 18c08e9d35..4568d20bd7 100644
--- a/sources/scalac/PhaseRepository.java
+++ b/sources/scalac/PhaseRepository.java
@@ -19,13 +19,13 @@ import scalac.transformer.AddAccessorsPhase;
 import scalac.transformer.AddInterfacesPhase;
 import scalac.transformer.ExpandMixinsPhase;
 import scalac.transformer.ErasurePhase;
+import scalac.transformer.AddConstructorsPhase;
 /*
 import scalac.optimizer.OptimizePhase;
-import scalac.backend.AddConstructorsPhase;
 import scalac.backend.msil.GenMSILPhase;
 import scalac.jaco.GenJavaPhase;
-import scalac.backend.jvm.GenJVMPhase;
 */
+import scalac.backend.jvm.GenJVMPhase;
 
 public class PhaseRepository {
 
@@ -54,12 +54,12 @@ public class PhaseRepository {
             ADDINTERFACES = new AddInterfacesPhase(),
             EXPANDMIXIN = new ExpandMixinsPhase(),
             ERASURE = new ErasurePhase(),
-	    /*
             ADDCONSTRUCTORS = new AddConstructorsPhase(),
+	    /*
             GENMSIL = new GenMSILPhase(),
             GENJAVA = new GenJavaPhase(),
-            GENJVM = new GenJVMPhase(),
 	    */
+            GENJVM = new GenJVMPhase(),
             TERMINAL = PhaseDescriptor.TERMINAL,
         };
     }
@@ -82,12 +82,12 @@ public class PhaseRepository {
     public final AddInterfacesPhase ADDINTERFACES;
     public final ExpandMixinsPhase EXPANDMIXIN;
     public final ErasurePhase ERASURE;
-    /*
     public final AddConstructorsPhase ADDCONSTRUCTORS;
+    /*
     public final GenMSILPhase GENMSIL;
     public final GenJavaPhase GENJAVA;
-    public final GenJVMPhase GENJVM;
     */
+    public final GenJVMPhase GENJVM;
     public final PhaseDescriptor TERMINAL;
 
     //########################################################################