jdk-sandbox: comparison src/hotspot/share/code/codeCache.cpp

equal deleted inserted replaced

-:c61f09122d3b
+:5529640c5f67
 while(iter.next()) {
 f(iter.method());
 }
 }
-void CodeCache::metadata_do(void f(Metadata* m)) {
+void CodeCache::metadata_do(MetadataClosure* f) {
 assert_locked_or_safepoint(CodeCache_lock);
 NMethodIterator iter(NMethodIterator::only_alive_and_not_unloading);
 while(iter.next()) {
 iter.method()->metadata_do(f);
 }
 CompiledMethod* nm = iter.method();
 if (nm->is_marked_for_deoptimization()) {
 // ...Already marked in the previous pass; count it here.
 // Also counts AOT compiled methods, already marked.
 number_of_marked_CodeBlobs++;
-} else if (nm->is_evol_dependent()) {
+} else if (nm->has_evol_metadata()) {
 ResourceMark rm;
 nm->mark_for_deoptimization();
 number_of_marked_CodeBlobs++;
-} else  {
+} else {
-// flush caches in case they refer to a redefined Method*
+// Inline caches that refer to an nmethod are deoptimized already, because
-nm->clear_inline_caches();
+// the Method* is walked in the metadata section of the nmethod.
+assert(!nm->is_evol_dependent(), "should no longer be necessary");
 }
 }
 // return total count of nmethods marked for deoptimization, if zero the caller
 // can skip deoptimization