*** old/src/share/vm/runtime/sweeper.cpp	Thu Nov  3 14:16:55 2016
--- new/src/share/vm/runtime/sweeper.cpp	Thu Nov  3 14:16:55 2016

*** 211,220 ****
--- 211,222 ----
  
    // Check for restart
    if (_current.method() != NULL) {
      if (_current.method()->is_nmethod()) {
        assert(CodeCache::find_blob_unsafe(_current.method()) == _current.method(), "Sweeper nmethod cached state invalid");
+     } else if (_current.method()->is_aot()) {
+       assert(CodeCache::find_blob_unsafe(_current.method()->code_begin()) == _current.method(), "Sweeper AOT method cached state invalid");
      } else {
        ShouldNotReachHere();
      }
    }
  

*** 568,578 ****
--- 570,580 ----
      ResourceMark rm;
      MutexLocker ml_patch(CompiledIC_lock);
      RelocIterator iter(nm);
      while (iter.next()) {
        if (iter.type() == relocInfo::virtual_call_type) {
!         CompiledIC::cleanup_call_site(iter.virtual_call_reloc(), nm);
        }
      }
    }
  
    MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);