*** empty log message ***

1 files changed, 9 insertions, 4 deletions

diff --git a/sources/scala/tools/nsc/Global.scala b/sources/scala/tools/nsc/Global.scala
index a53da84903..30e05a306d 100755
--- a/sources/scala/tools/nsc/Global.scala
+++ b/sources/scala/tools/nsc/Global.scala
@@ -66,6 +66,10 @@ class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable
     val global: Global.this.type = Global.this
   }
 
+  object overridingPairs extends OverridingPairs {
+    val global: Global.this.type = Global.this
+  }
+
   val copy = new LazyTreeCopier();
 
   type AttrInfo = Pair[Type, List[Any]];
@@ -179,10 +183,11 @@ class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable
     val global: Global.this.type = Global.this
   }
 
+/*
   object syntheticMethods extends SyntheticMethods {
     val global: Global.this.type = Global.this
   }
-
+*/
   object refchecks extends RefChecks {
     val global: Global.this.type = Global.this;
   }
@@ -240,10 +245,10 @@ class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable
   }
 
   def phaseDescriptors: List[SubComponent] = List(
-    analyzer.namerFactory, // needs to be first
-    analyzer.typerFactory, // needs to be second
+    analyzer.namerFactory,
+    analyzer.typerFactory,
     pickler,
-    syntheticMethods,
+//    syntheticMethods,
     refchecks,
     uncurry,
     tailCalls,