src/share/vm/opto/output.cpp

*** 637,647 ****
               cik->is_array_klass(), "Not supported allocation.");
        sv = new ObjectValue(spobj->_idx,
                             new ConstantOopWriteValue(cik->java_mirror()->constant_encoding()));
        Compile::set_sv_for_object_node(objs, sv);
  
!       uint first_ind = spobj->first_index();
        for (uint i = 0; i < spobj->n_fields(); i++) {
          Node* fld_node = sfpt->in(first_ind+i);
          (void)FillLocArray(sv->field_values()->length(), sfpt, fld_node, sv->field_values(), objs);
        }
      }
--- 637,647 ----
               cik->is_array_klass(), "Not supported allocation.");
        sv = new ObjectValue(spobj->_idx,
                             new ConstantOopWriteValue(cik->java_mirror()->constant_encoding()));
        Compile::set_sv_for_object_node(objs, sv);
  
!       uint first_ind = spobj->first_index(sfpt->jvms());
        for (uint i = 0; i < spobj->n_fields(); i++) {
          Node* fld_node = sfpt->in(first_ind+i);
          (void)FillLocArray(sv->field_values()->length(), sfpt, fld_node, sv->field_values(), objs);
        }
      }
*** 892,929 ****
  
      // Build the growable array of ScopeValues for exp stack
      GrowableArray<MonitorValue*> *monarray = new GrowableArray<MonitorValue*>(num_mon);
  
      // Loop over monitors and insert into array
!     for(idx = 0; idx < num_mon; idx++) {
        // Grab the node that defines this monitor
        Node* box_node = sfn->monitor_box(jvms, idx);
        Node* obj_node = sfn->monitor_obj(jvms, idx);
  
        // Create ScopeValue for object
        ScopeValue *scval = NULL;
  
!       if( obj_node->is_SafePointScalarObject() ) {
          SafePointScalarObjectNode* spobj = obj_node->as_SafePointScalarObject();
          scval = Compile::sv_for_node_id(objs, spobj->_idx);
          if (scval == NULL) {
!           const Type *t = obj_node->bottom_type();
            ciKlass* cik = t->is_oopptr()->klass();
            assert(cik->is_instance_klass() ||
                   cik->is_array_klass(), "Not supported allocation.");
            ObjectValue* sv = new ObjectValue(spobj->_idx,
                                              new ConstantOopWriteValue(cik->java_mirror()->constant_encoding()));
            Compile::set_sv_for_object_node(objs, sv);
  
!           uint first_ind = spobj->first_index();
            for (uint i = 0; i < spobj->n_fields(); i++) {
              Node* fld_node = sfn->in(first_ind+i);
              (void)FillLocArray(sv->field_values()->length(), sfn, fld_node, sv->field_values(), objs);
            }
            scval = sv;
          }
!       } else if( !obj_node->is_Con() ) {
          OptoReg::Name obj_reg = _regalloc->get_reg_first(obj_node);
          if( obj_node->bottom_type()->base() == Type::NarrowOop ) {
            scval = new_loc_value( _regalloc, obj_reg, Location::narrowoop );
          } else {
            scval = new_loc_value( _regalloc, obj_reg, Location::oop );
--- 892,929 ----
  
      // Build the growable array of ScopeValues for exp stack
      GrowableArray<MonitorValue*> *monarray = new GrowableArray<MonitorValue*>(num_mon);
  
      // Loop over monitors and insert into array
!     for (idx = 0; idx < num_mon; idx++) {
        // Grab the node that defines this monitor
        Node* box_node = sfn->monitor_box(jvms, idx);
        Node* obj_node = sfn->monitor_obj(jvms, idx);
  
        // Create ScopeValue for object
        ScopeValue *scval = NULL;
  
!       if (obj_node->is_SafePointScalarObject()) {
          SafePointScalarObjectNode* spobj = obj_node->as_SafePointScalarObject();
          scval = Compile::sv_for_node_id(objs, spobj->_idx);
          if (scval == NULL) {
!           const Type *t = spobj->bottom_type();
            ciKlass* cik = t->is_oopptr()->klass();
            assert(cik->is_instance_klass() ||
                   cik->is_array_klass(), "Not supported allocation.");
            ObjectValue* sv = new ObjectValue(spobj->_idx,
                                              new ConstantOopWriteValue(cik->java_mirror()->constant_encoding()));
            Compile::set_sv_for_object_node(objs, sv);
  
!           uint first_ind = spobj->first_index(youngest_jvms);
            for (uint i = 0; i < spobj->n_fields(); i++) {
              Node* fld_node = sfn->in(first_ind+i);
              (void)FillLocArray(sv->field_values()->length(), sfn, fld_node, sv->field_values(), objs);
            }
            scval = sv;
          }
!       } else if (!obj_node->is_Con()) {
          OptoReg::Name obj_reg = _regalloc->get_reg_first(obj_node);
          if( obj_node->bottom_type()->base() == Type::NarrowOop ) {
            scval = new_loc_value( _regalloc, obj_reg, Location::narrowoop );
          } else {
            scval = new_loc_value( _regalloc, obj_reg, Location::oop );