8313816: Accessing jmethodID might lead to spurious crashes (1)

.github/actions/do-build/action.yml

@@ -60,6 +60,7 @@ runs:
               $build_dir/configure.log \
               $build_dir/make-support/failure-summary.log \
               $build_dir/make-support/failure-logs/* \
+              $build_dir/make/hs_err*.log \
               failure-logs/ 2> /dev/null || true
           echo 'failure=true' >> $GITHUB_OUTPUT
         fi

src/hotspot/share/oops/instanceKlass.cpp

@@ -587,9 +587,6 @@ void InstanceKlass::deallocate_contents(ClassLoaderData* loader_data) {
   // Also remove mirror from handles
   loader_data->remove_handle(_java_mirror);
 
-  // Need to take this class off the class loader data list.
-  loader_data->remove_class(this);
-
   // The array_klass for this class is created later, after error handling.
   // For class redefinition, we keep the original class so this scratch class
   // doesn't have an array class.  Either way, assert that there is nothing
@@ -2828,6 +2825,10 @@ void InstanceKlass::release_C_heap_structures(bool release_sub_metadata) {
   jmethodID* jmeths = methods_jmethod_ids_acquire();
   if (jmeths != (jmethodID*)nullptr) {
     release_set_methods_jmethod_ids(nullptr);
+    size_t count = (size_t)jmeths[0];
+    for (size_t i = 1; i <= count; i++) {
+      *((Method**)jmeths[i]) = nullptr;
+    }
     FreeHeap(jmeths);
   }
 

src/hotspot/share/oops/method.hpp

@@ -783,7 +783,9 @@ class Method : public Metadata {
   // (see AsyncGetCallTrace support for Forte Analyzer) and this
   // needs to be async-safe. No allocation should be done and
   // so handles are not used to avoid deadlock.
-  jmethodID find_jmethod_id_or_null()               { return method_holder()->jmethod_id_or_null(this); }
+  jmethodID find_jmethod_id_or_null()               {
+    return method_holder() != nullptr ? method_holder()->jmethod_id_or_null(this) : nullptr;
+  }
 
   // Support for inlining of intrinsic methods
   vmIntrinsicID intrinsic_id() const          { return (vmIntrinsicID) _intrinsic_id;           }