src/share/vm/opto/output.cpp

rev 5728 : 8029015: PPC64 (part 216): opto: trap based null and range checks

*** 1457,1466 ****
--- 1457,1472 ----
            // Remember the beginning of the previous instruction, in case
            // it's followed by a flag-kill and a null-check.  Happens on
            // Intel all the time, with add-to-memory kind of opcodes.
            previous_offset = current_offset;
          }
+ 
+         // Not an else-if!
+         // If this is a trap based cmp then add its offset to the list.
+         if (mach->is_TrapBasedCheckNode()) {
+           inct_starts[inct_cnt++] = current_offset;
+         }
        }
  
        // Verify that there is sufficient space remaining
        cb->insts()->maybe_expand_to_ensure_remaining(MAX_inst_size);
        if ((cb->blob() == NULL) || (!CompileBroker::should_compile_new_jobs())) {
*** 1723,1732 ****
--- 1729,1744 ----
      if (n->is_MachNullCheck()) {
        uint block_num = block->non_connector_successor(0)->_pre_order;
        _inc_table.append(inct_starts[inct_cnt++], blk_labels[block_num].loc_pos());
        continue;
      }
+     // Handle implicit exception table updates: trap instructions.
+     if (n->is_Mach() && n->as_Mach()->is_TrapBasedCheckNode()) {
+       uint block_num = block->non_connector_successor(0)->_pre_order;
+       _inc_table.append(inct_starts[inct_cnt++], blk_labels[block_num].loc_pos());
+       continue;
+     }
    } // End of for all blocks fill in exception table entries
  }
  
  // Static Variables
  #ifndef PRODUCT