--- a/src/java.base/share/classes/java/util/concurrent/locks/LockSupport.java	Mon Oct 22 14:41:51 2018 -0700
+++ b/src/java.base/share/classes/java/util/concurrent/locks/LockSupport.java	Mon Oct 22 17:00:04 2018 -0700
@@ -141,7 +141,7 @@
 
     private static void setBlocker(Thread t, Object arg) {
         // Even though volatile, hotspot doesn't need a write barrier here.
-        U.putObject(t, PARKBLOCKER, arg);
+        U.putReference(t, PARKBLOCKER, arg);
     }
 
     /**
@@ -291,7 +291,7 @@
     public static Object getBlocker(Thread t) {
         if (t == null)
             throw new NullPointerException();
-        return U.getObjectVolatile(t, PARKBLOCKER);
+        return U.getReferenceVolatile(t, PARKBLOCKER);
     }
 
     /**