Removed $tag method from ScalaObject and rebuil...

Removed $tag method from ScalaObject and rebuilt starr.

7 files changed, 5 insertions, 27 deletions

diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1
index 6bcc48448d..610579e906 100644
--- a/lib/scala-compiler.jar.desired.sha1
+++ b/lib/scala-compiler.jar.desired.sha1
@@ -1 +1 @@
-9564f9861dd4c9711cd60bcc56d84c860aab486d ?scala-compiler.jar
+411677e42394197a7a276a797dcb84701f0122ac ?scala-compiler.jar
diff --git a/lib/scala-library-src.jar.desired.sha1 b/lib/scala-library-src.jar.desired.sha1
index 88e5328e7b..35121e5ed8 100644
--- a/lib/scala-library-src.jar.desired.sha1
+++ b/lib/scala-library-src.jar.desired.sha1
@@ -1 +1 @@
-f434edbc25d88cc06cdf0f833116521018103627 ?scala-library-src.jar
+7a39d3dbe5fe0c0afd6ea28db7d6e15de08015d4 ?scala-library-src.jar
diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1
index 79f9a160f6..6d0c58ac22 100644
--- a/lib/scala-library.jar.desired.sha1
+++ b/lib/scala-library.jar.desired.sha1
@@ -1 +1 @@
-4def0800f45abbc5296dd599fe32ca102684de65 ?scala-library.jar
+4af58eec26351edb985b661cdb376c668f10f62c ?scala-library.jar
diff --git a/src/android-library/scala/ScalaObject.scala b/src/android-library/scala/ScalaObject.scala
index d9481c0370..7376b85f61 100644
--- a/src/android-library/scala/ScalaObject.scala
+++ b/src/android-library/scala/ScalaObject.scala
@@ -13,11 +13,4 @@ package scala
 
 import Predef._
 
-trait ScalaObject extends AnyRef {
-
-  /** This method is needed for optimizing pattern matching expressions
-   *  which match on constructors of case classes.
-   */
-  def $tag(): Int = 0
-
-}
+trait ScalaObject extends AnyRef
\ No newline at end of file
diff --git a/src/compiler/scala/tools/nsc/symtab/Definitions.scala b/src/compiler/scala/tools/nsc/symtab/Definitions.scala
index 70d1a4e521..013c5be3d0 100644
--- a/src/compiler/scala/tools/nsc/symtab/Definitions.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Definitions.scala
@@ -86,7 +86,6 @@ trait Definitions {
 
     // the scala reference classes
     lazy val ScalaObjectClass: Symbol = getClass("scala.ScalaObject")
-      def ScalaObjectClass_tag = getMember(ScalaObjectClass, nme.tag)
     lazy val AnnotationClass: Symbol = getClass("scala.Annotation")
     lazy val ClassfileAnnotationClass: Symbol = getClass("scala.ClassfileAnnotation")
     lazy val StaticAnnotationClass: Symbol = getClass("scala.StaticAnnotation")
diff --git a/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala b/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala
index 6ea1a2eb69..55e484e203 100644
--- a/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala
@@ -104,11 +104,6 @@ trait SyntheticMethods { self: Analyzer =>
       typer.typed(DefDef(method, vparamss => Literal(Constant(clazz.name.decode))))
     }
 
-    def tagMethod: Tree = {
-      val method = syntheticMethod(nme.tag, 0, MethodType(List(), IntClass.tpe))
-      typer.typed(DefDef(method, vparamss => Literal(Constant(clazz.tag))))
-    }
-
     def forwardingMethod(name: Name): Tree = {
       val target = getMember(ScalaRunTimeModule, "_" + name)
       val paramtypes =
@@ -298,7 +293,6 @@ trait SyntheticMethods { self: Analyzer =>
                 stat.symbol.resetFlag(CASEACCESSOR)
               }
             }
-            if (!inIDE && !clazz.hasFlag(INTERFACE) && clazz.info.nonPrivateDecl(nme.tag) == NoSymbol) ts += tagMethod
           }
           if (clazz.isModuleClass) {
             if (!hasOverridingImplementation(Object_toString)) ts += moduleToStringMethod
diff --git a/src/library/scala/ScalaObject.scala b/src/library/scala/ScalaObject.scala
index 376a14bd6b..7376b85f61 100644
--- a/src/library/scala/ScalaObject.scala
+++ b/src/library/scala/ScalaObject.scala
@@ -13,12 +13,4 @@ package scala
 
 import Predef._
 
-trait ScalaObject extends AnyRef {
-
-  /** This method is needed for optimizing pattern matching expressions
-   *  which match on constructors of case classes.
-   */
-  @remote
-  def $tag(): Int = 0
-
-}
+trait ScalaObject extends AnyRef
\ No newline at end of file