diff -r d952dcd38dba -r 4a116dd82fb5 jdk/src/java.base/share/classes/java/lang/ClassLoader.java
--- a/jdk/src/java.base/share/classes/java/lang/ClassLoader.java	Fri Jun 02 18:32:39 2017 +0100
+++ b/jdk/src/java.base/share/classes/java/lang/ClassLoader.java	Mon Jun 05 16:05:24 2017 -0700
@@ -2884,7 +2884,7 @@
         } catch (NoSuchFieldException e) {
             throw new InternalError(e);
         }
-        return unsafe.compareAndSwapObject(this, offset, null, obj);
+        return unsafe.compareAndSetObject(this, offset, null, obj);
     }
 }