Change backend to handle polymorphic synchronized calls

Author: allanrenucci

src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala

@@ -254,8 +254,6 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
 
         BOOL
       }
-      else if (code == SYNCHRONIZED)
-        genSynchronized(tree, expectedType)
       else if (isCoercion(code)) {
         genLoad(receiver)
         lineNumber(tree)
@@ -714,8 +712,9 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
           generatedType = toTypeKind(c.typeValue)
           mkArrayConstructorCall(generatedType.asArrayBType, app, dims)
         case Apply(t :TypeApply, _) =>
-
-          generatedType = genTypeApply(t)
+          generatedType =
+            if (t.symbol ne Object_synchronized) genTypeApply(t)
+            else genSynchronized(app, expectedType)
 
         // 'super' call: Note: since constructors are supposed to
         // return an instance of what they construct, we have to take

src/compiler/scala/tools/nsc/backend/jvm/BCodeSyncAndTry.scala

@@ -28,7 +28,7 @@ trait BCodeSyncAndTry extends BCodeBodyBuilder {
   abstract class SyncAndTryBuilder(cunit: CompilationUnit) extends PlainBodyBuilder(cunit) {
 
     def genSynchronized(tree: Apply, expectedType: BType): BType = tree match {
-      case Apply(fun, args) =>
+      case Apply(TypeApply(fun, _), args) =>
       val monitor = locals.makeLocal(ObjectReference, "monitor", Object_Type, tree.pos)
       val monCleanup = new asm.Label
 

src/compiler/scala/tools/nsc/backend/jvm/BackendInterface.scala

@@ -697,6 +697,7 @@ abstract class BackendInterfaceDefinitions { self: BackendInterface =>
   val ObjectClass: Symbol
   val Object_isInstanceOf: Symbol
   val Object_asInstanceOf: Symbol
+  val Object_synchronized: Symbol
   val Object_equals: Symbol
   val ArrayClass: Symbol