diff options
Diffstat (limited to 'src')
4 files changed, 2 insertions, 24 deletions
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 |