8263721: Unify oop casting

Reviewed-by: kbarrett, coleenp

Author: stefank

src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp

@@ -178,7 +178,7 @@ int MacroAssembler::patch_oop(address insn_addr, address o) {
   // instruction.
   if (Instruction_aarch64::extract(insn, 31, 21) == 0b11010010101) {
     // Move narrow OOP
-    uint32_t n = CompressedOops::narrow_oop_value((oop)o);
+    uint32_t n = CompressedOops::narrow_oop_value(cast_to_oop(o));
     Instruction_aarch64::patch(insn_addr, 20, 5, n >> 16);
     Instruction_aarch64::patch(insn_addr+4, 20, 5, n & 0xffff);
     instructions = 2;

src/hotspot/cpu/ppc/relocInfo_ppc.cpp

@@ -58,7 +58,7 @@ void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
       assert(type() == relocInfo::oop_type || type() == relocInfo::metadata_type,
              "how to encode else?");
       narrowOop no = (type() == relocInfo::oop_type) ?
-          CompressedOops::encode((oop)x) :
+          CompressedOops::encode(cast_to_oop(x)) :
           // Type punning compressed klass pointer as narrowOop.
           CompressedOops::narrow_oop_cast(CompressedKlassPointers::encode((Klass*)x));
       nativeMovConstReg_at(addr())->set_narrow_oop(no, code());

src/hotspot/cpu/s390/frame_s390.cpp

@@ -297,7 +297,7 @@ BasicType frame::interpreter_frame_result(oop* oop_result, jvalue* value_result)
     switch (type) {
       case T_OBJECT:
       case T_ARRAY: {
-        *oop_result = (oop) (void*) ijava_state()->oop_tmp;
+        *oop_result = cast_to_oop((void*) ijava_state()->oop_tmp);
         break;
       }
       // We use std/stfd to store the values.

src/hotspot/cpu/s390/nativeInst_s390.cpp

@@ -429,7 +429,7 @@ address NativeMovConstReg::set_data_plain(intptr_t src, CodeBlob *cb) {
   }
   // cOops
   else if (MacroAssembler::is_load_narrow_oop(loc)) {
-    MacroAssembler::patch_load_narrow_oop(loc, (oop) (void*) x);
+    MacroAssembler::patch_load_narrow_oop(loc, cast_to_oop((void*) x));
     ICache::invalidate_range(loc, MacroAssembler::load_narrow_oop_size());
     next_address = next_instruction_address();
   }
@@ -441,7 +441,7 @@ address NativeMovConstReg::set_data_plain(intptr_t src, CodeBlob *cb) {
   }
   // cOops
   else if (MacroAssembler::is_compare_immediate_narrow_oop(loc)) {
-    MacroAssembler::patch_compare_immediate_narrow_oop(loc, (oop) (void*) x);
+    MacroAssembler::patch_compare_immediate_narrow_oop(loc, cast_to_oop((void*) x));
     ICache::invalidate_range(loc, MacroAssembler::compare_immediate_narrow_oop_size());
     next_address = next_instruction_address();
   }

src/hotspot/cpu/x86/relocInfo_x86.cpp

@@ -52,7 +52,7 @@ void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
     address disp = Assembler::locate_operand(addr(), which);
     // both compressed oops and compressed classes look the same
     if (CompressedOops::is_in((void*)x)) {
-      uint32_t encoded = CompressedOops::narrow_oop_value((oop)x);
+      uint32_t encoded = CompressedOops::narrow_oop_value(cast_to_oop(x));
       if (verify_only) {
         guarantee(*(uint32_t*) disp == encoded, "instructions must match");
       } else {

src/hotspot/cpu/zero/zeroInterpreter_zero.cpp

@@ -808,7 +808,7 @@ InterpreterFrame *InterpreterFrame::build(Method* const method, TRAPS) {
     if (method->is_static())
       object = method->constants()->pool_holder()->java_mirror();
     else
-      object = (oop) (void*)locals[0];
+      object = cast_to_oop((void*)locals[0]);
     monitor->set_obj(object);
   }
 

src/hotspot/share/classfile/javaClasses.cpp

@@ -1473,7 +1473,7 @@ objArrayOop java_lang_Class::signers(oop java_class) {
 }
 void java_lang_Class::set_signers(oop java_class, objArrayOop signers) {
   assert(_signers_offset != 0, "must be set");
-  java_class->obj_field_put(_signers_offset, (oop)signers);
+  java_class->obj_field_put(_signers_offset, signers);
 }
 
 oop java_lang_Class::class_data(oop java_class) {

src/hotspot/share/classfile/javaClasses.inline.hpp

@@ -40,7 +40,7 @@ void java_lang_String::set_value_raw(oop string, typeArrayOop buffer) {
 }
 
 void java_lang_String::set_value(oop string, typeArrayOop buffer) {
-  string->obj_field_put(_value_offset, (oop)buffer);
+  string->obj_field_put(_value_offset, buffer);
 }
 
 bool java_lang_String::hash_is_set(oop java_string) {

src/hotspot/share/code/dependencies.hpp

@@ -486,10 +486,10 @@ class Dependencies: public ResourceObj {
     bool is_oop() const                { return _is_oop; }
     bool is_metadata() const           { return !_is_oop; }
     bool is_klass() const              { return is_metadata() && metadata_value()->is_klass(); }
-    bool is_method() const              { return is_metadata() && metadata_value()->is_method(); }
+    bool is_method() const             { return is_metadata() && metadata_value()->is_method(); }
 
-    oop oop_value() const              { assert(_is_oop && _valid, "must be"); return (oop) _value; }
-    Metadata* metadata_value() const { assert(!_is_oop && _valid, "must be"); return (Metadata*) _value; }
+    oop oop_value() const              { assert(_is_oop && _valid, "must be"); return cast_to_oop(_value); }
+    Metadata* metadata_value() const   { assert(!_is_oop && _valid, "must be"); return (Metadata*) _value; }
   };
 
   static void print_dependency(DepType dept,

src/hotspot/share/code/nmethod.cpp

@@ -1026,7 +1026,7 @@ inline void nmethod::initialize_immediate_oop(oop* dest, jobject handle) {
   if (handle == NULL ||
       // As a special case, IC oops are initialized to 1 or -1.
       handle == (jobject) Universe::non_oop_word()) {
-    (*dest) = (oop) handle;
+    (*dest) = cast_to_oop(handle);
   } else {
     (*dest) = JNIHandles::resolve_non_null(handle);
   }
@@ -2721,7 +2721,7 @@ void nmethod::print_recorded_oops() {
     for (int i = 0; i < n; i++) {
       oop o = oop_at(i);
       tty->print("#%*d: " INTPTR_FORMAT " ", log_n, i, p2i(o));
-      if (o == (oop)Universe::non_oop_word()) {
+      if ((void*)o == Universe::non_oop_word()) {
         tty->print("non-oop word");
       } else if (o == NULL) {
         tty->print("NULL-oop");