src/share/vm/opto/gcm.cpp

rev 1838 : 6961690: load oops from constant table on SPARC
Summary: oops should be loaded from the constant table of an nmethod instead of materializing them with a long code sequence.
Reviewed-by:

*** 64,74 ****
  void PhaseCFG::replace_block_proj_ctrl( Node *n ) {
    const Node *in0 = n->in(0);
    assert(in0 != NULL, "Only control-dependent");
    const Node *p = in0->is_block_proj();
    if (p != NULL && p != n) {    // Control from a block projection?
!     assert(!n->pinned() || n->is_SafePointScalarObject(), "only SafePointScalarObject pinned node is expected here");
      // Find trailing Region
      Block *pb = _bbs[in0->_idx]; // Block-projection already has basic block
      uint j = 0;
      if (pb->_num_succs != 1) {  // More then 1 successor?
        // Search for successor
--- 64,74 ----
  void PhaseCFG::replace_block_proj_ctrl( Node *n ) {
    const Node *in0 = n->in(0);
    assert(in0 != NULL, "Only control-dependent");
    const Node *p = in0->is_block_proj();
    if (p != NULL && p != n) {    // Control from a block projection?
!     //assert(!n->pinned() || n->is_SafePointScalarObject(), "only SafePointScalarObject pinned node is expected here");
      // Find trailing Region
      Block *pb = _bbs[in0->_idx]; // Block-projection already has basic block
      uint j = 0;
      if (pb->_num_succs != 1) {  // More then 1 successor?
        // Search for successor