diff -r c09733aaf97f -r 1c7bbc426b1e hotspot/test/compiler/intrinsics/unsafe/UnsafeTwoCASLong.java
--- a/hotspot/test/compiler/intrinsics/unsafe/UnsafeTwoCASLong.java	Tue May 09 16:48:16 2017 +0100
+++ b/hotspot/test/compiler/intrinsics/unsafe/UnsafeTwoCASLong.java	Thu May 11 12:55:56 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,9 +72,8 @@
     }
 
     static void testAccess(Object base, long offset) {
-        UNSAFE.compareAndSwapLong(base, offset, 1L, 2L);
-        UNSAFE.compareAndSwapLong(base, offset, 2L, 1L);
+        UNSAFE.compareAndSetLong(base, offset, 1L, 2L);
+        UNSAFE.compareAndSetLong(base, offset, 2L, 1L);
     }
 
 }
-