--- old/hotspot/src/share/vm/oops/typeArrayOop.hpp	2015-12-16 21:11:19.581735290 +0100
+++ new/hotspot/src/share/vm/oops/typeArrayOop.hpp	2015-12-16 21:11:19.461735288 +0100
@@ -129,7 +129,7 @@
   Metadata* metadata_at(int which) const {
     return (Metadata*)*long_at_addr(which); }
   void metadata_at_put(int which, Metadata* contents) {
-    *long_at_addr(which) = (long)contents;
+    *long_at_addr(which) = (jlong)contents;
   }
 #else
   Metadata* metadata_at(int which) const {