*** old/src/share/vm/opto/parse2.cpp	Tue Apr 30 19:32:23 2013
--- new/src/share/vm/opto/parse2.cpp	Tue Apr 30 19:32:23 2013

*** 985,995 ****
--- 985,995 ----
      // the path may be cold again. Make sure it doesn't look untaken
      profile_taken_branch(target_bci, !ProfileInterpreter);
      uncommon_trap(Deoptimization::Reason_unreached,
                    Deoptimization::Action_reinterpret,
                    NULL, "cold");
!     if (EliminateAutoBox) {
!     if (C->eliminate_autobox()) {
        // Mark the successor blocks as parsed
        branch_block->next_path_num();
        next_block->next_path_num();
      }
      return;

*** 1010,1020 ****
--- 1010,1020 ----
      Node* iftrue  = _gvn.transform( new (C) IfTrueNode (iff) );
      set_control(iftrue);
  
      if (stopped()) {            // Path is dead?
        explicit_null_checks_elided++;
!       if (EliminateAutoBox) {
!       if (C->eliminate_autobox()) {
          // Mark the successor block as parsed
          branch_block->next_path_num();
        }
      } else {                    // Path is live.
        // Update method data

*** 1030,1040 ****
--- 1030,1040 ----
    Node* iffalse = _gvn.transform( new (C) IfFalseNode(iff) );
    set_control(iffalse);
  
    if (stopped()) {              // Path is dead?
      explicit_null_checks_elided++;
!     if (EliminateAutoBox) {
!     if (C->eliminate_autobox()) {
        // Mark the successor block as parsed
        next_block->next_path_num();
      }
    } else  {                     // Path is live.
      // Update method data

*** 1067,1077 ****
--- 1067,1077 ----
      // the path may be cold again. Make sure it doesn't look untaken
      profile_taken_branch(target_bci, !ProfileInterpreter);
      uncommon_trap(Deoptimization::Reason_unreached,
                    Deoptimization::Action_reinterpret,
                    NULL, "cold");
!     if (EliminateAutoBox) {
!     if (C->eliminate_autobox()) {
        // Mark the successor blocks as parsed
        branch_block->next_path_num();
        next_block->next_path_num();
      }
      return;

*** 1133,1143 ****
--- 1133,1143 ----
    { PreserveJVMState pjvms(this);
      taken_branch = _gvn.transform(taken_branch);
      set_control(taken_branch);
  
      if (stopped()) {
!       if (EliminateAutoBox) {
!       if (C->eliminate_autobox()) {
          // Mark the successor block as parsed
          branch_block->next_path_num();
        }
      } else {
        // Update method data

*** 1152,1162 ****
--- 1152,1162 ----
    untaken_branch = _gvn.transform(untaken_branch);
    set_control(untaken_branch);
  
    // Branch not taken.
    if (stopped()) {
!     if (EliminateAutoBox) {
!     if (C->eliminate_autobox()) {
        // Mark the successor block as parsed
        next_block->next_path_num();
      }
    } else {
      // Update method data