Merge branch 'master' into JDK-8333664+JDK-8353196-full

Author: alexeysemenyukoracle

src/hotspot/share/cds/aotClassInitializer.cpp

@@ -303,6 +303,7 @@ bool AOTClassInitializer::can_archive_initialized_mirror(InstanceKlass* ik) {
       {"java/lang/invoke/MethodHandles"},
       {"java/lang/invoke/SimpleMethodHandle"},
       {"java/lang/invoke/StringConcatFactory"},
+      {"java/lang/invoke/VarHandleGuards"},
       {"java/util/Collections"},
       {"java/util/stream/Collectors"},
       {"jdk/internal/constant/ConstantUtils"},

src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp

@@ -684,10 +684,6 @@ void ShenandoahConcurrentGC::op_init_mark() {
   assert(!heap->has_forwarded_objects(), "No forwarded objects on this path");
 
   if (heap->mode()->is_generational()) {
-    if (_generation->is_young()) {
-      ShenandoahGCPhase phase(ShenandoahPhaseTimings::init_swap_rset);
-      _generation->swap_card_tables();
-    }
 
     if (_generation->is_global()) {
       heap->old_generation()->cancel_gc();
@@ -698,6 +694,14 @@ void ShenandoahConcurrentGC::op_init_mark() {
       ShenandoahGCPhase phase(ShenandoahPhaseTimings::init_transfer_satb);
       heap->old_generation()->transfer_pointers_from_satb();
     }
+    {
+      // After we swap card table below, the write-table is all clean, and the read table holds
+      // cards dirty prior to the start of GC. Young and bootstrap collection will update
+      // the write card table as a side effect of remembered set scanning. Global collection will
+      // update the card table as a side effect of global marking of old objects.
+      ShenandoahGCPhase phase(ShenandoahPhaseTimings::init_swap_rset);
+      _generation->swap_card_tables();
+    }
   }
 
   if (ShenandoahVerify) {

src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp

@@ -1157,6 +1157,9 @@ void ShenandoahFullGC::phase5_epilog() {
 
     heap->free_set()->finish_rebuild(young_cset_regions, old_cset_regions, num_old);
 
+    // Set mark incomplete because the marking bitmaps have been reset except pinned regions.
+    heap->global_generation()->set_mark_incomplete();
+
     heap->clear_cancelled_gc(true /* clear oom handler */);
   }
 

src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp

@@ -1055,9 +1055,15 @@ void ShenandoahVerifier::verify_generic(VerifyOption vo) {
 }
 
 void ShenandoahVerifier::verify_before_concmark() {
-    verify_at_safepoint(
+  VerifyRememberedSet verify_remembered_set = _verify_remembered_before_marking;
+  if (_heap->mode()->is_generational() &&
+      !_heap->old_generation()->is_mark_complete()) {
+    // Before marking in generational mode, remembered set can't be verified w/o complete old marking.
+    verify_remembered_set = _verify_remembered_disable;
+  }
+  verify_at_safepoint(
           "Before Mark",
-          _verify_remembered_before_marking,
+          verify_remembered_set,
                                        // verify read-only remembered set from bottom() to top()
           _verify_forwarded_none,      // UR should have fixed up
           _verify_marked_disable,      // do not verify marked: lots ot time wasted checking dead allocations
@@ -1114,9 +1120,14 @@ void ShenandoahVerifier::verify_before_evacuation() {
 }
 
 void ShenandoahVerifier::verify_before_update_refs() {
+  VerifyRememberedSet verify_remembered_set = _verify_remembered_before_updating_references;
+  if (_heap->mode()->is_generational() &&
+      !_heap->old_generation()->is_mark_complete()) {
+    verify_remembered_set = _verify_remembered_disable;
+  }
   verify_at_safepoint(
           "Before Updating References",
-          _verify_remembered_before_updating_references,  // verify read-write remembered set
+          verify_remembered_set,        // verify read-write remembered set
           _verify_forwarded_allow,     // forwarded references allowed
           _verify_marked_complete,     // bitmaps might be stale, but alloc-after-mark should be well
           _verify_cset_forwarded,      // all cset refs are fully forwarded
@@ -1276,17 +1287,14 @@ class ShenandoahVerifyRemSetClosure : public BasicOopIterateClosure {
   void do_oop(oop* p)       override { work(p); }
 };
 
-ShenandoahMarkingContext* ShenandoahVerifier::get_marking_context_for_old() {
-  shenandoah_assert_generations_reconciled();
-  if (_heap->old_generation()->is_mark_complete() || _heap->gc_generation()->is_global()) {
-    return _heap->complete_marking_context();
-  }
-  return nullptr;
-}
-
 template<typename Scanner>
-void ShenandoahVerifier::help_verify_region_rem_set(Scanner* scanner, ShenandoahHeapRegion* r, ShenandoahMarkingContext* ctx,
+void ShenandoahVerifier::help_verify_region_rem_set(Scanner* scanner, ShenandoahHeapRegion* r,
                                                     HeapWord* registration_watermark, const char* message) {
+  shenandoah_assert_generations_reconciled();
+  ShenandoahOldGeneration* old_gen = _heap->old_generation();
+  assert(old_gen->is_mark_complete() || old_gen->is_parsable(), "Sanity");
+
+  ShenandoahMarkingContext* ctx = old_gen->is_mark_complete() ?old_gen->complete_marking_context() : nullptr;
   ShenandoahVerifyRemSetClosure<Scanner> check_interesting_pointers(scanner, message);
   HeapWord* from = r->bottom();
   HeapWord* obj_addr = from;
@@ -1357,7 +1365,6 @@ void ShenandoahVerifier::verify_rem_set_before_mark() {
   shenandoah_assert_safepoint();
   shenandoah_assert_generational();
 
-  ShenandoahMarkingContext* ctx = get_marking_context_for_old();
   ShenandoahOldGeneration* old_generation = _heap->old_generation();
 
   log_debug(gc)("Verifying remembered set at %s mark", old_generation->is_doing_mixed_evacuations() ? "mixed" : "young");
@@ -1366,7 +1373,7 @@ void ShenandoahVerifier::verify_rem_set_before_mark() {
   for (size_t i = 0, n = _heap->num_regions(); i < n; ++i) {
     ShenandoahHeapRegion* r = _heap->get_region(i);
     if (r->is_old() && r->is_active()) {
-      help_verify_region_rem_set(scanner, r, ctx, r->end(), "Verify init-mark remembered set violation");
+      help_verify_region_rem_set(scanner, r, r->end(), "Verify init-mark remembered set violation");
     }
   }
 }
@@ -1379,7 +1386,7 @@ void ShenandoahVerifier::verify_rem_set_after_full_gc() {
   for (size_t i = 0, n = _heap->num_regions(); i < n; ++i) {
     ShenandoahHeapRegion* r = _heap->get_region(i);
     if (r->is_old() && !r->is_cset()) {
-      help_verify_region_rem_set(&scanner, r, nullptr, r->top(), "Remembered set violation at end of Full GC");
+      help_verify_region_rem_set(&scanner, r, r->top(), "Remembered set violation at end of Full GC");
     }
   }
 }
@@ -1392,12 +1399,11 @@ void ShenandoahVerifier::verify_rem_set_before_update_ref() {
   shenandoah_assert_safepoint();
   shenandoah_assert_generational();
 
-  ShenandoahMarkingContext* ctx = get_marking_context_for_old();
   ShenandoahWriteTableScanner scanner(_heap->old_generation()->card_scan());
   for (size_t i = 0, n = _heap->num_regions(); i < n; ++i) {
     ShenandoahHeapRegion* r = _heap->get_region(i);
     if (r->is_old() && !r->is_cset()) {
-      help_verify_region_rem_set(&scanner, r, ctx, r->get_update_watermark(), "Remembered set violation at init-update-references");
+      help_verify_region_rem_set(&scanner, r, r->get_update_watermark(), "Remembered set violation at init-update-references");
     }
   }
 }

src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp

@@ -229,14 +229,12 @@ class ShenandoahVerifier : public CHeapObj<mtGC> {
   void verify_before_rebuilding_free_set();
 private:
   template<typename Scanner>
-  void help_verify_region_rem_set(Scanner* scanner, ShenandoahHeapRegion* r, ShenandoahMarkingContext* ctx,
+  void help_verify_region_rem_set(Scanner* scanner, ShenandoahHeapRegion* r,
                                   HeapWord* update_watermark, const char* message);
 
   void verify_rem_set_before_mark();
   void verify_rem_set_before_update_ref();
   void verify_rem_set_after_full_gc();
-
-  ShenandoahMarkingContext* get_marking_context_for_old();
 };
 
 #endif // SHARE_GC_SHENANDOAH_SHENANDOAHVERIFIER_HPP

src/java.base/share/classes/java/security/SecureClassLoader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 package java.security;
 
-import sun.security.util.Debug;
-
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
@@ -181,13 +179,6 @@ protected PermissionCollection getPermissions(CodeSource codesource)
         return new Permissions(); // ProtectionDomain defers the binding
     }
 
-    /*
-     * holder class for the static field "debug" to delay its initialization
-     */
-    private static class DebugHolder {
-        private static final Debug debug = Debug.getInstance("scl");
-    }
-
     /*
      * Returned cached ProtectionDomain for the specified CodeSource.
      */
@@ -209,10 +200,6 @@ public ProtectionDomain apply(CodeSourceKey key) {
                         = SecureClassLoader.this.getPermissions(key.cs);
                 ProtectionDomain pd = new ProtectionDomain(
                         key.cs, perms, SecureClassLoader.this, null);
-                if (DebugHolder.debug != null) {
-                    DebugHolder.debug.println(" getPermissions " + pd);
-                    DebugHolder.debug.println("");
-                }
                 return pd;
             }
         });