src/hotspot/share/opto/doCall.cpp

@@ -651,12 +651,12 @@
           set_control(null_ctl);
           replace_in_map(retnode, null());
           uncommon_trap(Deoptimization::Reason_null_check, Deoptimization::Action_none);
           set_bci(iter().cur_bci());
         }
-        const TypeValueTypePtr* vtptr = _gvn.type(retnode)->isa_valuetypeptr();
-        ValueTypeNode* vt = ValueTypeNode::make_from_oop(this, not_null_obj, vtptr->value_klass());
+        ciValueKlass* vk = _gvn.type(retnode)->value_klass();
+        ValueTypeNode* vt = ValueTypeNode::make_from_oop(this, not_null_obj, vk);
         push_node(T_VALUETYPE, vt);
       }
     }
 
     if (Bytecodes::has_optional_appendix(iter().cur_bc_raw()) || is_signature_polymorphic) {