src/hotspot/share/opto/macro.cpp

*** 964,974 ****
      safepoints_done.append_if_missing(sfpt); // keep it for rollback
    }
    // Scalarize value types that were added to the safepoint
    for (uint i = 0; i < value_worklist.size(); ++i) {
      Node* vt = value_worklist.at(i);
!     vt->as_ValueType()->make_scalar_in_safepoints(C->root(), &_igvn);
    }
    return true;
  }
  
  static void disconnect_projections(MultiNode* n, PhaseIterGVN& igvn) {
--- 964,974 ----
      safepoints_done.append_if_missing(sfpt); // keep it for rollback
    }
    // Scalarize value types that were added to the safepoint
    for (uint i = 0; i < value_worklist.size(); ++i) {
      Node* vt = value_worklist.at(i);
!     vt->as_ValueType()->make_scalar_in_safepoints(&_igvn);
    }
    return true;
  }
  
  static void disconnect_projections(MultiNode* n, PhaseIterGVN& igvn) {