--- a/src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java	Mon Oct 22 14:41:51 2018 -0700
+++ b/src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java	Mon Oct 22 17:00:04 2018 -0700
@@ -940,7 +940,7 @@
                 Object base = MethodHandleNatives.staticFieldBase(sdField);
                 long offset = MethodHandleNatives.staticFieldOffset(sdField);
                 UNSAFE.loadFence();
-                return metaType.cast(UNSAFE.getObject(base, offset));
+                return metaType.cast(UNSAFE.getReference(base, offset));
             } catch (Error err) {
                 throw err;
             } catch (Exception ex) {
@@ -970,7 +970,7 @@
                 Object base = MethodHandleNatives.staticFieldBase(sdField);
                 long offset = MethodHandleNatives.staticFieldOffset(sdField);
                 UNSAFE.storeFence();
-                UNSAFE.putObject(base, offset, speciesData);
+                UNSAFE.putReference(base, offset, speciesData);
                 UNSAFE.storeFence();
             } catch (Error err) {
                 throw err;