*** old/src/share/vm/memory/universe.cpp	Wed Jan 15 01:42:14 2014
--- new/src/share/vm/memory/universe.cpp	Wed Jan 15 01:42:14 2014

*** 1134,1144 ****
--- 1134,1144 ----
      }
      Universe::_pd_implies_cache->init(
        SystemDictionary::ProtectionDomain_klass(), m);;
    }
  
!   // The folowing is initializing converter functions for serialization in
!   // The following is initializing converter functions for serialization in
    // JVM.cpp. If we clean up the StrictMath code above we may want to find
    // a better solution for this as well.
    initialize_converter_functions();
  
    // This needs to be done before the first scavenge/gc, since

*** 1176,1186 ****
--- 1176,1186 ----
    assert_lock_strong(Compile_lock);
  
    if (CodeCache::number_of_nmethods_with_dependencies() == 0) return;
  
    // CodeCache can only be updated by a thread_in_VM and they will all be
!   // stopped dring the safepoint so CodeCache will be safe to update without
!   // stopped during the safepoint so CodeCache will be safe to update without
    // holding the CodeCache_lock.
  
    KlassDepChange changes(dependee);
  
    // Compute the dependent nmethods

*** 1197,1207 ****
--- 1197,1207 ----
    assert_lock_strong(Compile_lock);
  
    if (CodeCache::number_of_nmethods_with_dependencies() == 0) return;
  
    // CodeCache can only be updated by a thread_in_VM and they will all be
!   // stopped dring the safepoint so CodeCache will be safe to update without
!   // stopped during the safepoint so CodeCache will be safe to update without
    // holding the CodeCache_lock.
  
    CallSiteDepChange changes(call_site(), method_handle());
  
    // Compute the dependent nmethods that have a reference to a

*** 1228,1238 ****
--- 1228,1238 ----
    // --- Compile_lock is not held. However we are at a safepoint.
    assert_locked_or_safepoint(Compile_lock);
    if (CodeCache::number_of_nmethods_with_dependencies() == 0) return;
  
    // CodeCache can only be updated by a thread_in_VM and they will all be
!   // stopped dring the safepoint so CodeCache will be safe to update without
!   // stopped during the safepoint so CodeCache will be safe to update without
    // holding the CodeCache_lock.
  
    // Compute the dependent nmethods
    if (CodeCache::mark_for_evol_deoptimization(ev_k_h) > 0) {
      // At least one nmethod has been marked for deoptimization