Merge branch 'merge-inline' of /scratch/trunk3 into develop

16 files changed, 73 insertions, 73 deletions

diff --git a/test/files/run/existentials3.check b/test/files/run/existentials3.check
index 41dc1f767c..8559540f80 100644
--- a/test/files/run/existentials3.check
+++ b/test/files/run/existentials3.check
@@ -1,22 +1,22 @@
-_ <: scala.runtime.AbstractFunction0[_ <: Object with Test$ToS with scala.ScalaObject with scala.Product with scala.Serializable] with scala.ScalaObject with scala.Serializable with java.lang.Object
-_ <: Object with Test$ToS with scala.ScalaObject with scala.Product with scala.Serializable
-Object with Test$ToS with scala.ScalaObject
-Object with Test$ToS with scala.ScalaObject
-Object with Test$ToS with scala.ScalaObject
-scala.Function0[Object with Test$ToS with scala.ScalaObject]
-scala.Function0[Object with Test$ToS with scala.ScalaObject]
-_ <: Object with _ <: Object with Object with Test$ToS with scala.ScalaObject
-_ <: Object with _ <: Object with _ <: Object with Test$ToS with scala.ScalaObject
-scala.collection.immutable.List[Object with scala.collection.Seq[Int] with scala.ScalaObject]
-scala.collection.immutable.List[Object with scala.collection.Seq[_ <: Int] with scala.ScalaObject]
-_ <: scala.runtime.AbstractFunction0[_ <: Object with Test$ToS with scala.ScalaObject with scala.Product with scala.Serializable] with scala.ScalaObject with scala.Serializable with java.lang.Object
-_ <: Object with Test$ToS with scala.ScalaObject with scala.Product with scala.Serializable
-Object with Test$ToS with scala.ScalaObject
-Object with Test$ToS with scala.ScalaObject
-Object with Test$ToS with scala.ScalaObject
-scala.Function0[Object with Test$ToS with scala.ScalaObject]
-scala.Function0[Object with Test$ToS with scala.ScalaObject]
-_ <: Object with _ <: Object with Object with Test$ToS with scala.ScalaObject
-_ <: Object with _ <: Object with _ <: Object with Test$ToS with scala.ScalaObject
-scala.collection.immutable.List[Object with scala.collection.Seq[Int] with scala.ScalaObject]
-scala.collection.immutable.List[Object with scala.collection.Seq[_ <: Int] with scala.ScalaObject]
+_ <: scala.runtime.AbstractFunction0[_ <: Object with Test$ToS with scala.Product with scala.Serializable with Object] with scala.Serializable with java.lang.Object
+_ <: Object with Test$ToS with scala.Product with scala.Serializable with Object
+Object with Test$ToS
+Object with Test$ToS with Object
+Object with Test$ToS
+scala.Function0[Object with Test$ToS]
+scala.Function0[Object with Test$ToS]
+_ <: Object with _ <: Object with Object with Test$ToS with Object with Object
+_ <: Object with _ <: Object with _ <: Object with Test$ToS with Object with Object
+scala.collection.immutable.List[Object with scala.collection.Seq[Int] with Object]
+scala.collection.immutable.List[Object with scala.collection.Seq[_ <: Int] with Object]
+_ <: scala.runtime.AbstractFunction0[_ <: Object with Test$ToS with scala.Product with scala.Serializable with Object] with scala.Serializable with java.lang.Object
+_ <: Object with Test$ToS with scala.Product with scala.Serializable with Object
+Object with Test$ToS
+Object with Test$ToS with Object
+Object with Test$ToS
+scala.Function0[Object with Test$ToS]
+scala.Function0[Object with Test$ToS]
+_ <: Object with _ <: Object with Object with Test$ToS with Object with Object
+_ <: Object with _ <: Object with _ <: Object with Test$ToS with Object with Object
+scala.collection.immutable.List[Object with scala.collection.Seq[Int] with Object]
+scala.collection.immutable.List[Object with scala.collection.Seq[_ <: Int] with Object]
diff --git a/test/files/run/primitive-sigs-2.check b/test/files/run/primitive-sigs-2.check
index c69d1b54a6..0af1434cea 100644
--- a/test/files/run/primitive-sigs-2.check
+++ b/test/files/run/primitive-sigs-2.check
@@ -1,4 +1,4 @@
-T<java.lang.Object> interface scala.ScalaObject
+T<java.lang.Object> class java.lang.Object
 List(A, char, class java.lang.Object)
 a
 public <T> java.lang.Object Arr.arr4(java.lang.Object[],scala.reflect.Manifest<T>)
diff --git a/test/files/run/programmatic-main.check b/test/files/run/programmatic-main.check
index 6f253f5de1..b5a54f5ea7 100644
--- a/test/files/run/programmatic-main.check
+++ b/test/files/run/programmatic-main.check
@@ -4,25 +4,26 @@
                   namer   2  resolve names, attach symbols to named trees
          packageobjects   3  load package objects
                   typer   4  the meat and potatoes: type the trees
-         superaccessors   5  add super accessors in traits and nested classes
-                pickler   6  serialize symbol tables
-              refchecks   7  reference/override checking, translate nested objects
-                uncurry   8  uncurry, translate function values to anonymous classes
-              tailcalls   9  replace tail calls by jumps
-             specialize  10  @specialized-driven class and method specialization
-          explicitouter  11  this refs to outer pointers, translate patterns
-                erasure  12  erase types, add interfaces for traits
-               lazyvals  13  allocate bitmaps, translate lazy vals into lazified defs
-             lambdalift  14  move nested functions to top level
-           constructors  15  move field definitions into constructors
-                flatten  16  eliminate inner classes
-                  mixin  17  mixin composition
-                cleanup  18  platform-specific cleanups, generate reflective calls
-                  icode  19  generate portable intermediate code
-                inliner  20  optimization: do inlining
-inlineExceptionHandlers  21  optimization: inline exception handlers
-               closelim  22  optimization: eliminate uncalled closures
-                    dce  23  optimization: eliminate dead code
-                    jvm  24  generate JVM bytecode
-               terminal  25  The last phase in the compiler chain
+             extmethods   5  add extension methods for inline classes
+         superaccessors   6  add super accessors in traits and nested classes
+                pickler   7  serialize symbol tables
+              refchecks   8  reference/override checking, translate nested objects
+                uncurry   9  uncurry, translate function values to anonymous classes
+              tailcalls  10  replace tail calls by jumps
+             specialize  11  @specialized-driven class and method specialization
+          explicitouter  12  this refs to outer pointers, translate patterns
+                erasure  13  erase types, add interfaces for traits
+               lazyvals  14  allocate bitmaps, translate lazy vals into lazified defs
+             lambdalift  15  move nested functions to top level
+           constructors  16  move field definitions into constructors
+                flatten  17  eliminate inner classes
+                  mixin  18  mixin composition
+                cleanup  19  platform-specific cleanups, generate reflective calls
+                  icode  20  generate portable intermediate code
+                inliner  21  optimization: do inlining
+inlineExceptionHandlers  22  optimization: inline exception handlers
+               closelim  23  optimization: eliminate uncalled closures
+                    dce  24  optimization: eliminate dead code
+                    jvm  25  generate JVM bytecode
+               terminal  26  The last phase in the compiler chain
 
diff --git a/test/files/run/reify_ann1a.check b/test/files/run/reify_ann1a.check
index 2822238706..97d4848a49 100644
--- a/test/files/run/reify_ann1a.check
+++ b/test/files/run/reify_ann1a.check
@@ -1,5 +1,5 @@
 {
-  @new ann(immutable.this.List.apply[String]("1a")) @new ann(immutable.this.List.apply[String]("1b")) class C[@new ann(immutable.this.List.apply[String]("2a")) @new ann(immutable.this.List.apply[String]("2b")) T>: Nothing <: Any] extends Object with ScalaObject {
+  @new ann(immutable.this.List.apply[String]("1a")) @new ann(immutable.this.List.apply[String]("1b")) class C[@new ann(immutable.this.List.apply[String]("2a")) @new ann(immutable.this.List.apply[String]("2b")) T>: Nothing <: Any] extends scala.AnyRef {
     @new ann(immutable.this.List.apply[String]("3a")) @new ann(immutable.this.List.apply[String]("3b")) <paramaccessor> private[this] val x: T @ann(immutable.this.List.apply[String]("4a")) @ann(immutable.this.List.apply[String]("4b")) = _;
     def <init>(@new ann(immutable.this.List.apply[String]("3a")) @new ann(immutable.this.List.apply[String]("3b")) x: T @ann(immutable.this.List.apply[String]("4a")) @ann(immutable.this.List.apply[String]("4b"))) = {
       super.<init>();
@@ -14,7 +14,7 @@
   ()
 }
 {
-  @ann(immutable.this.List.apply[String]("1a")) @ann(immutable.this.List.apply[String]("1b")) class C[@ann(immutable.this.List.apply[String]("2a")) @ann(immutable.this.List.apply[String]("2b")) T>: Nothing <: Any] extends Object with ScalaObject {
+  @ann(immutable.this.List.apply[String]("1a")) @ann(immutable.this.List.apply[String]("1b")) class C[@ann(immutable.this.List.apply[String]("2a")) @ann(immutable.this.List.apply[String]("2b")) T>: Nothing <: Any] extends scala.AnyRef {
     @ann(immutable.this.List.apply[String]("3a")) @ann(immutable.this.List.apply[String]("3b")) <paramaccessor> private[this] val x: T @ann(immutable.this.List.apply[String]("4b")) @ann(immutable.this.List.apply[String]("4a")) = _;
     def <init>(@ann(immutable.this.List.apply[String]("3a")) @ann(immutable.this.List.apply[String]("3b")) x: T @ann(immutable.this.List.apply[String]("4b")) @ann(immutable.this.List.apply[String]("4a"))): C[T] = {
       C.super.<init>();
diff --git a/test/files/run/reify_ann1b.check b/test/files/run/reify_ann1b.check
index e240e1e0ce..ceebc0e2ed 100644
--- a/test/files/run/reify_ann1b.check
+++ b/test/files/run/reify_ann1b.check
@@ -1,5 +1,5 @@
 {
-  @new ann(bar = "1a") @new ann(bar = "1b") class C[@new ann(bar = "2a") @new ann(bar = "2b") T>: Nothing <: Any] extends Object with ScalaObject {
+  @new ann(bar = "1a") @new ann(bar = "1b") class C[@new ann(bar = "2a") @new ann(bar = "2b") T>: Nothing <: Any] extends scala.AnyRef {
     @new ann(bar = "3a") @new ann(bar = "3b") <paramaccessor> private[this] val x: T @ann(bar = "4a") @ann(bar = "4b") = _;
     def <init>(@new ann(bar = "3a") @new ann(bar = "3b") x: T @ann(bar = "4a") @ann(bar = "4b")) = {
       super.<init>();
@@ -14,7 +14,7 @@
   ()
 }
 {
-  @ann(bar = "1a") @ann(bar = "1b") class C[@ann(bar = "2a") @ann(bar = "2b") T>: Nothing <: Any] extends Object with ScalaObject {
+  @ann(bar = "1a") @ann(bar = "1b") class C[@ann(bar = "2a") @ann(bar = "2b") T>: Nothing <: Any] extends scala.AnyRef {
     @ann(bar = "3a") @ann(bar = "3b") <paramaccessor> private[this] val x: T @ann(bar = "4b") @ann(bar = "4a") = _;
     def <init>(@ann(bar = "3a") @ann(bar = "3b") x: T @ann(bar = "4b") @ann(bar = "4a")): C[T] = {
       C.super.<init>();
diff --git a/test/files/run/reify_classfileann_a.check b/test/files/run/reify_classfileann_a.check
index 1773263a94..419d916907 100644
--- a/test/files/run/reify_classfileann_a.check
+++ b/test/files/run/reify_classfileann_a.check
@@ -1,5 +1,5 @@
 {
-  @new ann(bar = "1", quux = Array("2", "3"), baz = new ann(bar = "4")) class C extends Object with ScalaObject {
+  @new ann(bar = "1", quux = Array("2", "3"), baz = new ann(bar = "4")) class C extends scala.AnyRef {
     def <init>() = {
       super.<init>();
       ()
@@ -8,7 +8,7 @@
   ()
 }
 {
-  @ann(bar = "1", quux = ["2", "3"], baz = ann(bar = "4")) class C extends Object with ScalaObject {
+  @ann(bar = "1", quux = ["2", "3"], baz = ann(bar = "4")) class C extends scala.AnyRef {
     def <init>(): C = {
       C.super.<init>();
       ()
diff --git a/test/files/run/repl-parens.check b/test/files/run/repl-parens.check
index 944846541f..69f0a9ce30 100644
--- a/test/files/run/repl-parens.check
+++ b/test/files/run/repl-parens.check
@@ -66,7 +66,7 @@ scala> 55 ; () => 5
 res13: () => Int = <function0>
 
 scala> () => { class X ; new X }
-res14: () => Object with ScalaObject = <function0>
+res14: () => Object = <function0>
 
 scala> 
 
diff --git a/test/files/run/t1195.check b/test/files/run/t1195.check
index dc521fb8ca..1214d0c4b5 100644
--- a/test/files/run/t1195.check
+++ b/test/files/run/t1195.check
@@ -1,6 +1,6 @@
-_ <: scala.runtime.AbstractFunction1[Int, _ <: Object with scala.ScalaObject with scala.Product with scala.Serializable] with scala.ScalaObject with scala.Serializable with java.lang.Object
-_ <: Object with scala.ScalaObject with scala.Product with scala.Serializable
-Object with scala.ScalaObject with scala.Product with scala.Serializable
-_ <: scala.runtime.AbstractFunction1[Int, _ <: Object with scala.ScalaObject with scala.Product with scala.Serializable] with scala.ScalaObject with scala.Serializable with java.lang.Object
-_ <: Object with scala.ScalaObject with scala.Product with scala.Serializable
-Object with scala.ScalaObject with scala.Product with scala.Serializable
+_ <: scala.runtime.AbstractFunction1[Int, _ <: Object with scala.Product with scala.Serializable with Object] with scala.Serializable with java.lang.Object
+_ <: Object with scala.Product with scala.Serializable with Object
+Object with scala.Product with scala.Serializable
+_ <: scala.runtime.AbstractFunction1[Int, _ <: Object with scala.Product with scala.Serializable with Object] with scala.Serializable with java.lang.Object
+_ <: Object with scala.Product with scala.Serializable with Object
+Object with scala.Product with scala.Serializable
diff --git a/test/files/run/t4110.check b/test/files/run/t4110.check
index 8b005989de..dea7e5957c 100644
--- a/test/files/run/t4110.check
+++ b/test/files/run/t4110.check
@@ -1,2 +1,2 @@
-Object with Test$A with Test$B
-Object with Test$A with Test$B
+Object with Test$A with Test$B with Object
+Object with Test$A with Test$B with Object
diff --git a/test/files/run/t4172.check b/test/files/run/t4172.check
index 95e3eb950d..b94da0c9d8 100644
--- a/test/files/run/t4172.check
+++ b/test/files/run/t4172.check
@@ -4,7 +4,7 @@ Type :help for more information.
 scala> 
 
 scala>     val c = { class C { override def toString = "C" }; ((new C, new C { def f = 2 })) }
-c: (C, C{def f: Int}) forSome { type C <: Object with ScalaObject } = (C,C)
+c: (C, C with Object{def f: Int}) forSome { type C <: Object } = (C,C)
 
 scala> 
 
diff --git a/test/files/run/t4891.check b/test/files/run/t4891.check
index 072f8df8d4..79fd7f6fbb 100644
--- a/test/files/run/t4891.check
+++ b/test/files/run/t4891.check
@@ -5,4 +5,3 @@ test.generic.C1
 test.generic.C2
   (m) public void test.generic.C1.m1()
 null
-interface scala.ScalaObject
diff --git a/test/files/run/t5224.check b/test/files/run/t5224.check
index 5bead91b36..28bc75d4fd 100644
--- a/test/files/run/t5224.check
+++ b/test/files/run/t5224.check
@@ -1,5 +1,5 @@
 {
-  @new Foo(bar = "qwe") class C extends Object with ScalaObject {
+  @new Foo(bar = "qwe") class C extends scala.AnyRef {
     def <init>() = {
       super.<init>();
       ()
diff --git a/test/files/run/t5271_1.check b/test/files/run/t5271_1.check
index d4fd544e88..9b956da17a 100644
--- a/test/files/run/t5271_1.check
+++ b/test/files/run/t5271_1.check
@@ -1,5 +1,5 @@
 {
-  case class C extends Object with ScalaObject with Product with Serializable {
+  case class C extends Object with Product with Serializable {
     <caseaccessor> <paramaccessor> val foo : Int = _;
     <caseaccessor> <paramaccessor> val bar : Int = _;
     def <init>(foo: Int, bar: Int) = {
diff --git a/test/files/run/t5271_2.check b/test/files/run/t5271_2.check
index 5a519f265f..27297febb6 100644
--- a/test/files/run/t5271_2.check
+++ b/test/files/run/t5271_2.check
@@ -1,5 +1,5 @@
 {
-  case class C extends Object with ScalaObject with Product with Serializable {
+  case class C extends Object with Product with Serializable {
     <caseaccessor> <paramaccessor> val foo : Int = _;
     <caseaccessor> <paramaccessor> val bar : Int = _;
     def <init>(foo: Int, bar: Int) = {
diff --git a/test/files/run/t5271_3.check b/test/files/run/t5271_3.check
index be87696f02..9331c78959 100644
--- a/test/files/run/t5271_3.check
+++ b/test/files/run/t5271_3.check
@@ -1,12 +1,12 @@
 {
-  object C extends Object with ScalaObject with Serializable {
+  object C extends scala.AnyRef with Serializable {
     def <init>() = {
       super.<init>();
       ()
     };
     def qwe: Int = 4
   };
-  case class C extends Object with ScalaObject with Product with Serializable {
+  case class C extends Object with Product with Serializable {
     <caseaccessor> <paramaccessor> val foo : Int = _;
     <caseaccessor> <paramaccessor> val bar : Int = _;
     def <init>(foo: Int, bar: Int) = {
diff --git a/test/files/run/t5527.check b/test/files/run/t5527.check
index 4a8a9ce602..bb13928fd8 100644
--- a/test/files/run/t5527.check
+++ b/test/files/run/t5527.check
@@ -1,13 +1,13 @@
 [[syntax trees at end of parser]]// Scala source: newSource1
 package <empty> {
-  object UselessComments extends scala.ScalaObject {
+  object UselessComments extends scala.AnyRef {
     def <init>() = {
       super.<init>();
       ()
     };
     var z = 0;
     def test1 = {
-      object Maybe extends scala.ScalaObject {
+      object Maybe extends scala.AnyRef {
         def <init>() = {
           super.<init>();
           ()
@@ -42,13 +42,13 @@ package <empty> {
     }
   };
   /** comments that we should keep */
-  object UsefulComments extends scala.ScalaObject {
+  object UsefulComments extends scala.AnyRef {
     def <init>() = {
       super.<init>();
       ()
     };
     /** class A */
-    class A extends scala.ScalaObject {
+    class A extends scala.AnyRef {
       def <init>() = {
         super.<init>();
         ()
@@ -61,7 +61,7 @@ package <empty> {
       var u = 2
     };
     /** trait B */
-    abstract trait B extends scala.ScalaObject {
+    abstract trait B extends scala.AnyRef {
       def $init$() = {
         ()
       };
@@ -75,7 +75,7 @@ package <empty> {
       var u = 2
     };
     /** object C */
-    object C extends scala.ScalaObject {
+    object C extends scala.AnyRef {
       def <init>() = {
         super.<init>();
         ()
@@ -88,7 +88,7 @@ package <empty> {
       var u = 2
     };
     /** class D */
-    @new deprecated("use ... instead", "2.10.0") class D extends scala.ScalaObject {
+    @new deprecated("use ... instead", "2.10.0") class D extends scala.AnyRef {
       def <init>() = {
         super.<init>();
         ()