changeset 1711:839d5feb156c

Conformance fix: drop support for synchronized interface methods
author mcimadamore
date Tue, 08 Jan 2013 15:24:05 +0100
parents 2e8ccb7ba243
children 867db5e69121
files src/share/classes/com/sun/tools/javac/code/Flags.java test/tools/javac/defaultMethods/syntax/TestDefaultMethodsSyntax.java test/tools/javac/lambdaShapes/org/openjdk/tests/vm/DefaultMethodsTest.java
diffstat 3 files changed, 5 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/code/Flags.java	Tue Jan 08 13:31:41 2013 +0100
+++ b/src/share/classes/com/sun/tools/javac/code/Flags.java	Tue Jan 08 15:24:05 2013 +0100
@@ -290,7 +290,7 @@
         ExtendedClassFlags          = ClassFlags | PACKAGE_PRIVATE,
         MemberClassFlags            = LocalClassFlags | INTERFACE | ExtendedAccessFlags,        
         ExtendedStandardFlags       = (long)StandardFlags | DEFAULT | PACKAGE_PRIVATE,
-        InterfaceMethodMask         = ABSTRACT | PRIVATE | STATIC | PUBLIC | STRICTFP | SYNCHRONIZED | DEFAULT,
+        InterfaceMethodMask         = ABSTRACT | PRIVATE | STATIC | PUBLIC | STRICTFP | DEFAULT,
         LocalVarFlags               = FINAL | PARAMETER;
 
 
--- a/test/tools/javac/defaultMethods/syntax/TestDefaultMethodsSyntax.java	Tue Jan 08 13:31:41 2013 +0100
+++ b/test/tools/javac/defaultMethods/syntax/TestDefaultMethodsSyntax.java	Tue Jan 08 15:24:05 2013 +0100
@@ -152,14 +152,14 @@
             /* NONE */           { T   , T    , C        , T       , T       , T     , C     , C           , C    , C       , I   },
             /* PUBLIC */         { T   , F    , F        , F       , T       , T     , C     , C           , C    , C       , I   },
             /* PROTECTED */      { C   , F    , F        , F       , C       , C     , C     , C           , C    , C       , F   },
-            /* PRIVATE */        { T   , F    , F        , F       , F       , C     , C     , T           , C    , T       , F   },
+            /* PRIVATE */        { T   , F    , F        , F       , F       , C     , C     , C           , C    , T       , F   },
             /* ABSTRACT */       { T   , T    , C        , F       , F       , F     , F     , F           , F    , F       , F   },
-            /* STATIC */         { T   , T    , C        , C       , F       , F     , C     , T           , C    , T       , F   },
+            /* STATIC */         { T   , T    , C        , C       , F       , F     , C     , C           , C    , T       , F   },
             /* NATIVE */         { C   , C    , C        , C       , F       , C     , F     , C           , C    , F       , F   },
-            /* SYNCHRONIZED */   { C   , C    , C        , T       , F       , T     , C     , F           , C    , C       , I   },
+            /* SYNCHRONIZED */   { C   , C    , C        , C       , F       , C     , C     , F           , C    , C       , F   },
             /* FINAL */          { C   , C    , C        , C       , F       , C     , C     , C           , F    , C       , F   },
             /* STRICTFP */       { C   , C    , C        , T       , F       , T     , F     , C           , C    , F       , I   },
-            /* DEFAULT */        { I   , I    , F        , F       , F       , F     , F     , I           , F    , I       , F   }};
+            /* DEFAULT */        { I   , I    , F        , F       , F       , F     , F     , F           , F    , I       , F   }};
     }
 
     enum MethodKind {
--- a/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/DefaultMethodsTest.java	Tue Jan 08 13:31:41 2013 +0100
+++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/DefaultMethodsTest.java	Tue Jan 08 15:24:05 2013 +0100
@@ -807,20 +807,8 @@
             fail("Could not load class", e);
         }
     }
-
-    public void testSynchronizedDefault() {
-        try {
-            java.lang.Class.forName("org.openjdk.tests.vm.SynchronizedDefault");
-        } catch (Exception e) {
-            fail("Could not load class", e);
-        }
-    }
 }
 
 interface StrictfpDefault {
     default strictfp void m() {}
 }
-
-interface SynchronizedDefault {
-    default synchronized void m() {}
-}