src/hotspot/share/opto/machnode.cpp

*** 414,10 ***
--- 414,26 ---
      assert(false, "this path may produce not optimal code");
      return TypePtr::BOTTOM;
    }
    assert(tp->base() != Type::AnyPtr, "not a bare pointer");
  
+   if (tp->isa_aryptr()) {
+     // In the case of a flat inline type array, each field has its
+     // own slice so we need to extract the field being accessed from
+     // the address computation
+     if (offset == Type::OffsetBot) {
+       Node* base;
+       Node* index;
+       const MachOper* oper = memory_inputs(base, index);
+       if (oper != (MachOper*)-1) {
+         offset = oper->constant_disp();
+         return tp->is_aryptr()->add_field_offset_and_offset(offset)->add_offset(Type::OffsetBot);
+       }
+     }
+     return tp->is_aryptr()->add_field_offset_and_offset(offset);
+   }
+ 
    return tp->add_offset(offset);
  }
  
  
  //-----------------------------operand_index---------------------------------

*** 707,25 ***
  
  //=============================================================================
  
  bool MachCallNode::cmp( const Node &n ) const
  { return _tf == ((MachCallNode&)n)._tf; }
! const Type *MachCallNode::bottom_type() const { return tf()->range(); }
! const Type* MachCallNode::Value(PhaseGVN* phase) const { return tf()->range(); }
  
  #ifndef PRODUCT
  void MachCallNode::dump_spec(outputStream *st) const {
    st->print("# ");
    if (tf() != nullptr)  tf()->dump_on(st);
    if (_cnt != COUNT_UNKNOWN)  st->print(" C=%f",_cnt);
    if (jvms() != nullptr)  jvms()->dump_spec(st);
  }
  #endif
  
- #ifndef _LP64
  bool MachCallNode::return_value_is_used() const {
!   if (tf()->range()->cnt() == TypeFunc::Parms) {
      // void return
      return false;
    }
  
    // find the projection corresponding to the return value
--- 723,24 ---
  
  //=============================================================================
  
  bool MachCallNode::cmp( const Node &n ) const
  { return _tf == ((MachCallNode&)n)._tf; }
! const Type *MachCallNode::bottom_type() const { return tf()->range_cc(); }
! const Type* MachCallNode::Value(PhaseGVN* phase) const { return tf()->range_cc(); }
  
  #ifndef PRODUCT
  void MachCallNode::dump_spec(outputStream *st) const {
    st->print("# ");
    if (tf() != nullptr)  tf()->dump_on(st);
    if (_cnt != COUNT_UNKNOWN)  st->print(" C=%f",_cnt);
    if (jvms() != nullptr)  jvms()->dump_spec(st);
  }
  #endif
  
  bool MachCallNode::return_value_is_used() const {
!   if (tf()->range_sig()->cnt() == TypeFunc::Parms) {
      // void return
      return false;
    }
  
    // find the projection corresponding to the return value

*** 736,26 ***
        return true;
      }
    }
    return false;
  }
- #endif
  
  // Similar to cousin class CallNode::returns_pointer
  // Because this is used in deoptimization, we want the type info, not the data
  // flow info; the interpreter will "use" things that are dead to the optimizer.
  bool MachCallNode::returns_pointer() const {
!   const TypeTuple *r = tf()->range();
    return (r->cnt() > TypeFunc::Parms &&
            r->field_at(TypeFunc::Parms)->isa_ptr());
  }
  
  //------------------------------Registers--------------------------------------
  const RegMask &MachCallNode::in_RegMask(uint idx) const {
    // Values in the domain use the users calling convention, embodied in the
    // _in_rms array of RegMasks.
!   if (idx < tf()->domain()->cnt()) {
      return _in_rms[idx];
    }
    if (idx == mach_constant_base_node_input()) {
      return MachConstantBaseNode::static_out_RegMask();
    }
--- 751,34 ---
        return true;
      }
    }
    return false;
  }
  
  // Similar to cousin class CallNode::returns_pointer
  // Because this is used in deoptimization, we want the type info, not the data
  // flow info; the interpreter will "use" things that are dead to the optimizer.
  bool MachCallNode::returns_pointer() const {
!   const TypeTuple *r = tf()->range_sig();
    return (r->cnt() > TypeFunc::Parms &&
            r->field_at(TypeFunc::Parms)->isa_ptr());
  }
  
+ bool MachCallNode::returns_scalarized() const {
+   return tf()->returns_inline_type_as_fields();
+ }
+ 
  //------------------------------Registers--------------------------------------
  const RegMask &MachCallNode::in_RegMask(uint idx) const {
    // Values in the domain use the users calling convention, embodied in the
    // _in_rms array of RegMasks.
!   if (entry_point() == nullptr && idx == TypeFunc::Parms) {
+     // Null entry point is a special cast where the target of the call
+     // is in a register.
+     return MachNode::in_RegMask(idx);
+   }
+   if (idx < tf()->domain_sig()->cnt()) {
      return _in_rms[idx];
    }
    if (idx == mach_constant_base_node_input()) {
      return MachConstantBaseNode::static_out_RegMask();
    }

*** 784,11 ***
  
  //------------------------------Registers--------------------------------------
  const RegMask &MachCallJavaNode::in_RegMask(uint idx) const {
    // Values in the domain use the users calling convention, embodied in the
    // _in_rms array of RegMasks.
!   if (idx < tf()->domain()->cnt()) {
      return _in_rms[idx];
    }
    if (idx == mach_constant_base_node_input()) {
      return MachConstantBaseNode::static_out_RegMask();
    }
--- 807,11 ---
  
  //------------------------------Registers--------------------------------------
  const RegMask &MachCallJavaNode::in_RegMask(uint idx) const {
    // Values in the domain use the users calling convention, embodied in the
    // _in_rms array of RegMasks.
!   if (idx < tf()->domain_cc()->cnt()) {
      return _in_rms[idx];
    }
    if (idx == mach_constant_base_node_input()) {
      return MachConstantBaseNode::static_out_RegMask();
    }