src/share/vm/opto/parse1.cpp

rev 8216 : maybe fix + debug
rev 8221 : 8174164: SafePointNode::_replaced_nodes breaks with irreducible loops
Reviewed-by: kvn

*** 1046,1056 ****
        }
        if (C->env()->dtrace_method_probes()) {
          kit.make_dtrace_method_exit(method());
        }
        if (_replaced_nodes_for_exceptions) {
!         kit.map()->apply_replaced_nodes();
        }
        // Done with exception-path processing.
        ex_map = kit.make_exception_state(ex_oop);
        assert(ex_jvms->same_calls_as(ex_map->jvms()), "sanity");
        // Pop the last vestige of this method:
--- 1046,1056 ----
        }
        if (C->env()->dtrace_method_probes()) {
          kit.make_dtrace_method_exit(method());
        }
        if (_replaced_nodes_for_exceptions) {
!         kit.map()->apply_replaced_nodes(_new_idx);
        }
        // Done with exception-path processing.
        ex_map = kit.make_exception_state(ex_oop);
        assert(ex_jvms->same_calls_as(ex_map->jvms()), "sanity");
        // Pop the last vestige of this method:
*** 1067,1077 ****
      SafePointNode* ex_map;
      while ((ex_map = caller.pop_exception_state()) != NULL) {
        _exits.add_exception_state(ex_map);
      }
    }
!   _exits.map()->apply_replaced_nodes();
  }
  
  //-----------------------------create_entry_map-------------------------------
  // Initialize our parser map to contain the types at method entry.
  // For OSR, the map contains a single RawPtr parameter.
--- 1067,1077 ----
      SafePointNode* ex_map;
      while ((ex_map = caller.pop_exception_state()) != NULL) {
        _exits.add_exception_state(ex_map);
      }
    }
!   _exits.map()->apply_replaced_nodes(_new_idx);
  }
  
  //-----------------------------create_entry_map-------------------------------
  // Initialize our parser map to contain the types at method entry.
  // For OSR, the map contains a single RawPtr parameter.