- Redefined SYNCHRONIZED

2 files changed, 6 insertions, 7 deletions

diff --git a/sources/scalac/backend/Primitive.java b/sources/scalac/backend/Primitive.java
index 6f317c252e..5cc6f49106 100644
--- a/sources/scalac/backend/Primitive.java
+++ b/sources/scalac/backend/Primitive.java
@@ -73,6 +73,9 @@ public class Primitive {
     public case HASHCODE;                     // x.hashcode()
     public case TOSTRING;                     // x.toString()
 
+    // AnyRef operations
+    public case SYNCHRONIZED;                 // x.synchronized(y)
+
     // String operations
     public case CONCAT;                       // String.valueOf(x)+String.valueOf(y)
 
@@ -172,8 +175,6 @@ public class Primitive {
     public case D2F;                          // RunTime.d2f(x)
     public case D2D;                          // RunTime.d2d(x)
 
-    public case SYNCHRONIZED;                 // RunTime.synchronised(x,y)
-
     /** Return negated version of comparison primitive. */
     public Primitive negate() {
         switch (this) {
diff --git a/sources/scalac/backend/Primitives.java b/sources/scalac/backend/Primitives.java
index e54fe93a9f..26e158e0c7 100644
--- a/sources/scalac/backend/Primitives.java
+++ b/sources/scalac/backend/Primitives.java
@@ -167,8 +167,6 @@ public class Primitives {
     private static final Name D2F_N = Name.fromString("d2f");
     private static final Name D2D_N = Name.fromString("d2d");
 
-    private static final Name SYNCHRONIZED_N = Name.fromString("synchronised");
-
     //########################################################################
     // Primitives state
 
@@ -310,8 +308,6 @@ public class Primitives {
     public final Symbol D2F;
     public final Symbol D2D;
 
-    public final Symbol SYNCHRONIZED;
-
     //########################################################################
     // Primitives constructor
 
@@ -443,7 +439,6 @@ public class Primitives {
         this.D2L = getUniqueTerm(RUNTIME, D2L_N);
         this.D2F = getUniqueTerm(RUNTIME, D2F_N);
         this.D2D = getUniqueTerm(RUNTIME, D2D_N);
-        this.SYNCHRONIZED = getUniqueTerm(RUNTIME, SYNCHRONIZED_N);
         initPrimitives();
     }
 
@@ -476,6 +471,9 @@ public class Primitives {
         addPrimitive(defs.ANY_HASHCODE, Primitive.HASHCODE);
         addPrimitive(defs.ANY_TOSTRING, Primitive.TOSTRING);
 
+        // scala.AnyRef
+        addPrimitive(defs.ANYREF_SYNCHRONIZED, Primitive.SYNCHRONIZED);
+
         // scala.Unit
         addAll(defs.UNIT_CLASS, Names.EQ, Primitive.EQ, 1);
         addAll(defs.UNIT_CLASS, Names.NE, Primitive.NE, 1);