< prev index next >

src/hotspot/share/opto/machnode.cpp

Print this page

        

*** 380,389 **** --- 380,405 ---- 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 flattened value 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---------------------------------
*** 653,664 **** //============================================================================= 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() != NULL) tf()->dump_on(st); --- 669,680 ---- //============================================================================= 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() != NULL) tf()->dump_on(st);
*** 666,680 **** if (jvms() != NULL) jvms()->dump_spec(st); } #endif 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 for (DUIterator_Fast imax, i = fast_outs(imax); i < imax; i++) { Node *use = fast_out(i); if (!use->is_Proj()) continue; if (use->as_Proj()->_con == TypeFunc::Parms) { --- 682,698 ---- if (jvms() != NULL) jvms()->dump_spec(st); } #endif bool MachCallNode::return_value_is_used() const { ! if (tf()->range_sig()->cnt() == TypeFunc::Parms) { // void return return false; } + assert(tf()->returns_value_type_as_fields(), "multiple return values not supported"); + // find the projection corresponding to the return value for (DUIterator_Fast imax, i = fast_outs(imax); i < imax; i++) { Node *use = fast_out(i); if (!use->is_Proj()) continue; if (use->as_Proj()->_con == TypeFunc::Parms) {
*** 686,705 **** // 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(); } --- 704,732 ---- // 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_vt() const { + return tf()->returns_value_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() == NULL && 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(); }
*** 728,738 **** //------------------------------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(); } --- 755,765 ---- //------------------------------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(); }
< prev index next >