src/hotspot/share/oops/instanceKlass.cpp

rev 50866 : 8203826: Chain exception from initialization in later NoClassDefFoundErrors.

@@ -935,18 +935,22 @@
       DTRACE_CLASSINIT_PROBE_WAIT(erroneous, -1, wait);
       ResourceMark rm(THREAD);
       const char* desc = "Could not initialize class ";
       const char* className = external_name();
       size_t msglen = strlen(desc) + strlen(className) + 1;
-      char* message = NEW_RESOURCE_ARRAY(char, msglen);
+      char* message = NEW_RESOURCE_ARRAY_IN_THREAD_RETURN_NULL(THREAD, char, msglen);
       if (NULL == message) {
         // Out of memory: can't create detailed error message
-          THROW_MSG(vmSymbols::java_lang_NoClassDefFoundError(), className);
+        message = const_cast<char*>(className);
       } else {
         jio_snprintf(message, msglen, "%s%s", desc, className);
-          THROW_MSG(vmSymbols::java_lang_NoClassDefFoundError(), message);
       }
+      Exceptions::_throw_msg_cause(THREAD_AND_LOCATION,
+                                   vmSymbols::java_lang_NoClassDefFoundError(),
+                                   message,
+                                   class_loader_data()->query_init_exception(java_mirror_handle(), THREAD));
+      return;
     }
 
     // Step 6
     set_init_state(being_initialized);
     set_init_thread(self);

@@ -972,10 +976,11 @@
     if (HAS_PENDING_EXCEPTION) {
       Handle e(THREAD, PENDING_EXCEPTION);
       CLEAR_PENDING_EXCEPTION;
       {
         EXCEPTION_MARK;
+        class_loader_data()->record_init_exception(java_mirror_handle(), e, THREAD);
         // Locks object, set state, and notify all waiting threads
         set_initialization_state_and_notify(initialization_error, THREAD);
         CLEAR_PENDING_EXCEPTION;
       }
       DTRACE_CLASSINIT_PROBE_WAIT(super__failed, -1, wait);

@@ -1024,18 +1029,24 @@
       // JVMTI has already reported the pending exception
       // JVMTI internal flag reset is needed in order to report ExceptionInInitializerError
       JvmtiExport::clear_detected_exception((JavaThread*)THREAD);
     }
     DTRACE_CLASSINIT_PROBE_WAIT(error, -1, wait);
-    if (e->is_a(SystemDictionary::Error_klass())) {
-      THROW_OOP(e());
-    } else {
+    if (!e->is_a(SystemDictionary::Error_klass())) {
+      // Wrap anything but errors into ExceptionInInitializerError.
       JavaCallArguments args(e);
-      THROW_ARG(vmSymbols::java_lang_ExceptionInInitializerError(),
+      Handle h_loader(THREAD, NULL);
+      Handle h_prot(THREAD, NULL);
+      e = Exceptions::new_exception(THREAD,
+                                    vmSymbols::java_lang_ExceptionInInitializerError(),
                 vmSymbols::throwable_void_signature(),
-                &args);
+                                    &args, h_loader, h_prot);
     }
+    // Store the exception that originally caused <clinit> to fail so
+    // it can be chained into potential later NoClassDefFoundErrors.
+    class_loader_data()->record_init_exception(java_mirror_handle(), e, THREAD);
+    THROW_OOP(e());
   }
   DTRACE_CLASSINIT_PROBE_WAIT(end, -1, wait);
 }