Reworking synchronized patch.

Eliminated annotation and custom phase.  Kept SYNCHRONIZED flag.

1 files changed, 2 insertions, 25 deletions

diff --git a/src/compiler/scala/tools/nsc/transform/TailCalls.scala b/src/compiler/scala/tools/nsc/transform/TailCalls.scala
index 39ca60d870..23697a4730 100644
--- a/src/compiler/scala/tools/nsc/transform/TailCalls.scala
+++ b/src/compiler/scala/tools/nsc/transform/TailCalls.scala
@@ -173,29 +173,6 @@ abstract class TailCalls extends Transform {
       trees map (t => transform(t, nctx))
     }
 
-    /**
-     * Transforms methods with synchronized body into synchronized methods
-     */
-    private def transformSynchronizedMethods(tree: Tree): Tree = {
-      def isSelfSynchronized(body: Apply) = body.fun match {
-        case TypeApply(fun @ Select(This(_), _), List(TypeTree()))
-        if (fun.symbol == Object_synchronized &&
-          fun.qualifier.symbol == tree.symbol.enclClass &&
-          !tree.symbol.enclClass.isTrait) => true
-        case _ => false
-      }
-
-      tree match {
-        case DefDef(mods, name, tparams, vparamss, tpt, rhs @ Apply(_, List(body)))
-        if (isSelfSynchronized(rhs)) =>
-          val res = treeCopy.DefDef(tree, mods, name, tparams, vparamss, tpt, body)
-          res.symbol withAnnotation AnnotationInfo(SynchronizedAttr.tpe, Nil, Nil)
-          res
-        case _ =>
-          tree
-      }
-    }
-
     override def transform(tree: Tree): Tree = {
       /** A possibly polymorphic apply to be considered for tail call transformation.
        */
@@ -245,8 +222,8 @@ abstract class TailCalls extends Transform {
         else                            rewriteTailCall(receiver)
       }
 
-      transformSynchronizedMethods(tree) match {
-        case dd @ DefDef(mods, name, tparams, vparams, tpt, rhs) =>
+      tree match {
+        case dd @ DefDef(_, _, _, vparamss0, _, rhs0) =>
           val newCtx = new Context(dd)
           debuglog("Considering " + dd.name + " for tailcalls")
           val newRHS = transform(rhs0, newCtx)