--- a/hotspot/src/share/vm/oops/methodData.hpp	Wed Sep 25 17:47:51 2013 +0200
+++ b/hotspot/src/share/vm/oops/methodData.hpp	Thu Sep 26 10:25:02 2013 -0400
@@ -333,10 +333,10 @@
     return (int)data()->cell_at(index);
   }
   void set_oop_at(int index, oop value) {
-    set_intptr_at(index, (intptr_t) value);
+    set_intptr_at(index, cast_from_oop<intptr_t>(value));
   }
   oop oop_at(int index) {
-    return (oop)intptr_at(index);
+    return cast_to_oop(intptr_at(index));
   }
 
   void set_flag_at(int flag_number) {