src/hotspot/share/opto/callnode.hpp

*** 708,718 ****
      if (ValueTypeReturnedAsFields &&
          method != NULL &&
          method->is_method_handle_intrinsic() &&
          r->cnt() > TypeFunc::Parms &&
          r->field_at(TypeFunc::Parms)->isa_valuetypeptr() &&
!         r->field_at(TypeFunc::Parms)->is_valuetypeptr()->value_type()->value_klass() == C->env()->___Value_klass()) {
        init_flags(Flag_is_macro);
        C->add_macro_node(this);
      }
  
      _is_scalar_replaceable = false;
--- 708,718 ----
      if (ValueTypeReturnedAsFields &&
          method != NULL &&
          method->is_method_handle_intrinsic() &&
          r->cnt() > TypeFunc::Parms &&
          r->field_at(TypeFunc::Parms)->isa_valuetypeptr() &&
!         r->field_at(TypeFunc::Parms)->is_valuetypeptr()->is__Value()) {
        init_flags(Flag_is_macro);
        C->add_macro_node(this);
      }
  
      _is_scalar_replaceable = false;
*** 877,887 ****
    // True when MemBar for new is redundant with MemBar at initialzer exit
    bool _is_allocation_MemBar_redundant;
  
    virtual uint size_of() const; // Size is bigger
    AllocateNode(Compile* C, const TypeFunc *atype, Node *ctrl, Node *mem, Node *abio,
!                Node *size, Node *klass_node, Node *initial_test, ValueTypeNode* value_node = NULL);
    // Expansion modifies the JVMState, so we need to clone it
    virtual void  clone_jvms(Compile* C) {
      if (jvms() != NULL) {
        set_jvms(jvms()->clone_deep(C));
        jvms()->set_map_deep(this);
--- 877,887 ----
    // True when MemBar for new is redundant with MemBar at initialzer exit
    bool _is_allocation_MemBar_redundant;
  
    virtual uint size_of() const; // Size is bigger
    AllocateNode(Compile* C, const TypeFunc *atype, Node *ctrl, Node *mem, Node *abio,
!                Node *size, Node *klass_node, Node *initial_test, ValueTypeBaseNode* value_node = NULL);
    // Expansion modifies the JVMState, so we need to clone it
    virtual void  clone_jvms(Compile* C) {
      if (jvms() != NULL) {
        set_jvms(jvms()->clone_deep(C));
        jvms()->set_map_deep(this);