Merge remote-tracking branch 'odersky/topic/inline' into merge-inline

Conflicts:
	lib/scala-compiler.jar.desired.sha1
	lib/scala-library-src.jar.desired.sha1
	lib/scala-library.jar.desired.sha1
	src/compiler/scala/reflect/internal/Definitions.scala
	src/compiler/scala/reflect/internal/Symbols.scala
	src/compiler/scala/tools/nsc/Global.scala
	src/compiler/scala/tools/nsc/transform/Constructors.scala
	src/compiler/scala/tools/nsc/transform/Erasure.scala
	src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
	src/compiler/scala/tools/nsc/typechecker/Contexts.scala
	src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
	src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala
	src/library/scala/Function0.scala
	src/library/scala/Function1.scala
	src/library/scala/Function10.scala
	src/library/scala/Function11.scala
	src/library/scala/Function12.scala
	src/library/scala/Function13.scala
	src/library/scala/Function14.scala
	src/library/scala/Function15.scala
	src/library/scala/Function16.scala
	src/library/scala/Function17.scala
	src/library/scala/Function18.scala
	src/library/scala/Function19.scala
	src/library/scala/Function2.scala
	src/library/scala/Function20.scala
	src/library/scala/Function21.scala
	src/library/scala/Function22.scala
	src/library/scala/Function3.scala
	src/library/scala/Function4.scala
	src/library/scala/Function5.scala
	src/library/scala/Function6.scala
	src/library/scala/Function7.scala
	src/library/scala/Function8.scala
	src/library/scala/Function9.scala
	test/files/codelib/code.jar.desired.sha1
	test/files/neg/anyval-children-2.check
	test/files/run/programmatic-main.check

18 files changed, 22 insertions, 22 deletions

diff --git a/test/files/scalap/abstractClass/result.test b/test/files/scalap/abstractClass/result.test
index 98c5047cbc..9163346fc6 100644
--- a/test/files/scalap/abstractClass/result.test
+++ b/test/files/scalap/abstractClass/result.test
@@ -1,4 +1,4 @@
-abstract class AbstractClass extends java.lang.Object with scala.AnyRef {
+abstract class AbstractClass extends java.lang.Object {
   def this() = { /* compiled code */ }
   def foo : scala.Predef.String
 }
diff --git a/test/files/scalap/abstractMethod/result.test b/test/files/scalap/abstractMethod/result.test
index 062a458c13..90f572f258 100644
--- a/test/files/scalap/abstractMethod/result.test
+++ b/test/files/scalap/abstractMethod/result.test
@@ -1,4 +1,4 @@
-trait AbstractMethod extends java.lang.Object with scala.AnyRef {
+trait AbstractMethod extends java.lang.Object {
   def $init$() : scala.Unit = { /* compiled code */ }
   def arity : scala.Int
   def isCool : scala.Boolean = { /* compiled code */ }
diff --git a/test/files/scalap/caseClass/result.test b/test/files/scalap/caseClass/result.test
index 7c94b52cf7..7dfe3a0356 100644
--- a/test/files/scalap/caseClass/result.test
+++ b/test/files/scalap/caseClass/result.test
@@ -1,4 +1,4 @@
-case class CaseClass[A <: scala.Seq[scala.Int]](i : A, s : scala.Predef.String) extends java.lang.Object with scala.Product with scala.Serializable with scala.AnyRef {
+case class CaseClass[A <: scala.Seq[scala.Int]](i : A, s : scala.Predef.String) extends scala.AnyRef with scala.Product with scala.Serializable {
   val i : A = { /* compiled code */ }
   val s : scala.Predef.String = { /* compiled code */ }
   def foo : scala.Int = { /* compiled code */ }
diff --git a/test/files/scalap/caseObject/result.test b/test/files/scalap/caseObject/result.test
index 9c66c6ebb1..867a4b2162 100644
--- a/test/files/scalap/caseObject/result.test
+++ b/test/files/scalap/caseObject/result.test
@@ -1,4 +1,4 @@
-case object CaseObject extends java.lang.Object with scala.Product with scala.Serializable {
+case object CaseObject extends scala.AnyRef with scala.Product with scala.Serializable {
   def bar : scala.Int = { /* compiled code */ }
   override def productPrefix : java.lang.String = { /* compiled code */ }
   def productArity : scala.Int = { /* compiled code */ }
diff --git a/test/files/scalap/cbnParam/result.test b/test/files/scalap/cbnParam/result.test
index d00a13d2d7..fbe035d63c 100644
--- a/test/files/scalap/cbnParam/result.test
+++ b/test/files/scalap/cbnParam/result.test
@@ -1,3 +1,3 @@
-class CbnParam extends java.lang.Object with scala.AnyRef {
+class CbnParam extends java.lang.Object {
   def this(s : => scala.Predef.String) = { /* compiled code */ }
 }
diff --git a/test/files/scalap/classPrivate/result.test b/test/files/scalap/classPrivate/result.test
index 1846b7f0ea..5f2e1cc00e 100644
--- a/test/files/scalap/classPrivate/result.test
+++ b/test/files/scalap/classPrivate/result.test
@@ -1,10 +1,10 @@
-class ClassPrivate extends java.lang.Object with scala.AnyRef {
+class ClassPrivate extends java.lang.Object {
   def this() = { /* compiled code */ }
   def baz : scala.Int = { /* compiled code */ }
-  class Outer extends java.lang.Object with scala.AnyRef {
+  class Outer extends java.lang.Object {
     def this() = { /* compiled code */ }
     private[ClassPrivate] def qux : scala.Int = { /* compiled code */ }
   }
   protected def quux : scala.Int = { /* compiled code */ }
   private[ClassPrivate] def bar : scala.Int = { /* compiled code */ }
-}
\ No newline at end of file
+}
diff --git a/test/files/scalap/classWithExistential/result.test b/test/files/scalap/classWithExistential/result.test
index 078b93ad89..b8ce005da9 100644
--- a/test/files/scalap/classWithExistential/result.test
+++ b/test/files/scalap/classWithExistential/result.test
@@ -1,4 +1,4 @@
-class ClassWithExistential extends java.lang.Object with scala.AnyRef {
+class ClassWithExistential extends java.lang.Object {
   def this() = { /* compiled code */ }
   def foo[A, B] : scala.Function1[A, B forSome {type A <: scala.Seq[scala.Int]; type B >: scala.Predef.String}] = { /* compiled code */ }
-}
\ No newline at end of file
+}
diff --git a/test/files/scalap/classWithSelfAnnotation/result.test b/test/files/scalap/classWithSelfAnnotation/result.test
index 37b2bae5e0..df7bd86643 100644
--- a/test/files/scalap/classWithSelfAnnotation/result.test
+++ b/test/files/scalap/classWithSelfAnnotation/result.test
@@ -1,4 +1,4 @@
-class ClassWithSelfAnnotation extends java.lang.Object with scala.AnyRef {
+class ClassWithSelfAnnotation extends java.lang.Object {
  this : ClassWithSelfAnnotation with java.lang.CharSequence =>
   def this() = { /* compiled code */ }
   def foo : scala.Int = { /* compiled code */ }
diff --git a/test/files/scalap/covariantParam/result.test b/test/files/scalap/covariantParam/result.test
index 9e4dbb802d..2f52f1f28e 100644
--- a/test/files/scalap/covariantParam/result.test
+++ b/test/files/scalap/covariantParam/result.test
@@ -1,4 +1,4 @@
-class CovariantParam[+A] extends java.lang.Object with scala.AnyRef {
+class CovariantParam[+A] extends java.lang.Object {
   def this() = { /* compiled code */ }
   def foo[A](a : A) : scala.Int = { /* compiled code */ }
 }
diff --git a/test/files/scalap/implicitParam/result.test b/test/files/scalap/implicitParam/result.test
index 05be2f9ae1..0ea212dda6 100644
--- a/test/files/scalap/implicitParam/result.test
+++ b/test/files/scalap/implicitParam/result.test
@@ -1,4 +1,4 @@
-class ImplicitParam extends java.lang.Object with scala.AnyRef {
+class ImplicitParam extends java.lang.Object {
   def this() = { /* compiled code */ }
   def foo(i : scala.Int)(implicit f : scala.Float, d : scala.Double) : scala.Int = { /* compiled code */ }
 }
diff --git a/test/files/scalap/paramClauses/result.test b/test/files/scalap/paramClauses/result.test
index ff7c879933..dc4397386c 100644
--- a/test/files/scalap/paramClauses/result.test
+++ b/test/files/scalap/paramClauses/result.test
@@ -1,4 +1,4 @@
-class ParamClauses extends java.lang.Object with scala.AnyRef {
+class ParamClauses extends java.lang.Object {
   def this() = { /* compiled code */ }
   def foo(i : scala.Int)(s : scala.Predef.String)(t : scala.Double) : scala.Int = { /* compiled code */ }
 }
diff --git a/test/files/scalap/paramNames/result.test b/test/files/scalap/paramNames/result.test
index a18c6350e3..4d3c7d0c1e 100644
--- a/test/files/scalap/paramNames/result.test
+++ b/test/files/scalap/paramNames/result.test
@@ -1,4 +1,4 @@
-class ParamNames extends java.lang.Object with scala.AnyRef {
+class ParamNames extends java.lang.Object {
   def this() = { /* compiled code */ }
   def foo(s : => scala.Seq[scala.Int], s2 : => scala.Seq[scala.Any]) : scala.Unit = { /* compiled code */ }
 }
diff --git a/test/files/scalap/sequenceParam/result.test b/test/files/scalap/sequenceParam/result.test
index ca004ab0bf..ed47c094fe 100644
--- a/test/files/scalap/sequenceParam/result.test
+++ b/test/files/scalap/sequenceParam/result.test
@@ -1,3 +1,3 @@
-class SequenceParam extends java.lang.Object with scala.AnyRef {
+class SequenceParam extends java.lang.Object {
   def this(s : scala.Predef.String, i : scala.Int*) = { /* compiled code */ }
 }
diff --git a/test/files/scalap/simpleClass/result.test b/test/files/scalap/simpleClass/result.test
index f350720895..905046ce52 100644
--- a/test/files/scalap/simpleClass/result.test
+++ b/test/files/scalap/simpleClass/result.test
@@ -1,4 +1,4 @@
-class SimpleClass extends java.lang.Object with scala.AnyRef {
+class SimpleClass extends java.lang.Object {
   def this() = { /* compiled code */ }
   def foo : scala.Int = { /* compiled code */ }
 }
diff --git a/test/files/scalap/traitObject/result.test b/test/files/scalap/traitObject/result.test
index e9a72316e9..d0521043c8 100644
--- a/test/files/scalap/traitObject/result.test
+++ b/test/files/scalap/traitObject/result.test
@@ -1,4 +1,4 @@
-trait TraitObject extends java.lang.Object with scala.AnyRef {
+trait TraitObject extends java.lang.Object {
   def $init$() : scala.Unit = { /* compiled code */ }
   def foo : scala.Int = { /* compiled code */ }
 }
diff --git a/test/files/scalap/typeAnnotations/result.test b/test/files/scalap/typeAnnotations/result.test
index fe48e081d3..d28712f12b 100644
--- a/test/files/scalap/typeAnnotations/result.test
+++ b/test/files/scalap/typeAnnotations/result.test
@@ -1,8 +1,8 @@
-abstract class TypeAnnotations[@scala.specialized R] extends java.lang.Object with scala.AnyRef {
+abstract class TypeAnnotations[@scala.specialized R] extends java.lang.Object {
   def this() = { /* compiled code */ }
   @scala.specialized
   val x : scala.Int = { /* compiled code */ }
   @scala.specialized
   type T
   def compose[@scala.specialized A](x : A, y : R) : A = { /* compiled code */ }
-}
\ No newline at end of file
+}
diff --git a/test/files/scalap/valAndVar/result.test b/test/files/scalap/valAndVar/result.test
index 287dfa6163..90081acade 100644
--- a/test/files/scalap/valAndVar/result.test
+++ b/test/files/scalap/valAndVar/result.test
@@ -1,4 +1,4 @@
-class ValAndVar extends java.lang.Object with scala.AnyRef {
+class ValAndVar extends java.lang.Object {
   def this() = { /* compiled code */ }
   val foo : java.lang.String = { /* compiled code */ }
   var bar : scala.Int = { /* compiled code */ }
diff --git a/test/files/scalap/wildcardType/result.test b/test/files/scalap/wildcardType/result.test
index ceb7c9ba7f..28147b6605 100644
--- a/test/files/scalap/wildcardType/result.test
+++ b/test/files/scalap/wildcardType/result.test
@@ -1,3 +1,3 @@
-class WildcardType extends java.lang.Object with scala.AnyRef {
+class WildcardType extends java.lang.Object {
   def this(f : scala.Function1[scala.Int, _]) = { /* compiled code */ }
 }