hotspot/src/share/vm/classfile/javaClasses.cpp

*** 2173,2182 ****
--- 2173,2190 ----
    // Fill in class name
    ResourceMark rm(THREAD);
    const char* str = holder->external_name();
    oop classname = StringTable::intern((char*) str, CHECK);
    java_lang_StackTraceElement::set_declaringClass(element(), classname);
+   java_lang_StackTraceElement::set_declaringClassObject(element(), holder->java_mirror());
+ 
+   oop loader = holder->class_loader();
+   if (loader != NULL) {
+     oop loader_name = java_lang_ClassLoader::name(loader);
+     if (loader_name != NULL)
+       java_lang_StackTraceElement::set_classLoaderName(element(), loader_name);
+   }
  
    // The method can be NULL if the requested class version is gone
    Symbol* sym = !method.is_null() ? method->name() : holder->constants()->symbol_at(cpref);
  
    // Fill in method name
*** 3431,3440 ****
--- 3439,3449 ----
  // Support for java_lang_ClassLoader
  
  bool java_lang_ClassLoader::offsets_computed = false;
  int  java_lang_ClassLoader::_loader_data_offset = -1;
  int  java_lang_ClassLoader::parallelCapable_offset = -1;
+ int  java_lang_ClassLoader::name_offset = -1;
  int  java_lang_ClassLoader::unnamedModule_offset = -1;
  
  ClassLoaderData** java_lang_ClassLoader::loader_data_addr(oop loader) {
      assert(loader != NULL && loader->is_oop(), "loader must be oop");
      return (ClassLoaderData**) loader->address_field_addr(_loader_data_offset);
*** 3451,3460 ****
--- 3460,3472 ----
    // The field indicating parallelCapable (parallelLockMap) is only present starting in 7,
    Klass* k1 = SystemDictionary::ClassLoader_klass();
    compute_optional_offset(parallelCapable_offset,
      k1, vmSymbols::parallelCapable_name(), vmSymbols::concurrenthashmap_signature());
  
+   compute_offset(name_offset,
+     k1, vmSymbols::name_name(), vmSymbols::string_signature());
+ 
    compute_offset(unnamedModule_offset,
      k1, vmSymbols::unnamedModule_name(), vmSymbols::module_signature());
  
    CLASSLOADER_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET);
  }
*** 3462,3471 ****
--- 3474,3488 ----
  oop java_lang_ClassLoader::parent(oop loader) {
    assert(is_instance(loader), "loader must be oop");
    return loader->obj_field(parent_offset);
  }
  
+ oop java_lang_ClassLoader::name(oop loader) {
+   assert(is_instance(loader), "loader must be oop");
+   return loader->obj_field(name_offset);
+ }
+ 
  bool java_lang_ClassLoader::isAncestor(oop loader, oop cl) {
    assert(is_instance(loader), "loader must be oop");
    assert(cl == NULL || is_instance(cl), "cl argument must be oop");
    oop acl = loader;
    debug_only(jint loop_count = 0);
*** 3617,3632 ****
  int java_lang_ClassLoader::parent_offset;
  int java_lang_System::static_in_offset;
  int java_lang_System::static_out_offset;
  int java_lang_System::static_err_offset;
  int java_lang_System::static_security_offset;
- int java_lang_StackTraceElement::declaringClass_offset;
  int java_lang_StackTraceElement::methodName_offset;
  int java_lang_StackTraceElement::fileName_offset;
  int java_lang_StackTraceElement::lineNumber_offset;
  int java_lang_StackTraceElement::moduleName_offset;
  int java_lang_StackTraceElement::moduleVersion_offset;
  int java_lang_StackFrameInfo::_declaringClass_offset;
  int java_lang_StackFrameInfo::_memberName_offset;
  int java_lang_StackFrameInfo::_bci_offset;
  int java_lang_StackFrameInfo::_version_offset;
  int java_lang_LiveStackFrameInfo::_monitors_offset;
--- 3634,3651 ----
  int java_lang_ClassLoader::parent_offset;
  int java_lang_System::static_in_offset;
  int java_lang_System::static_out_offset;
  int java_lang_System::static_err_offset;
  int java_lang_System::static_security_offset;
  int java_lang_StackTraceElement::methodName_offset;
  int java_lang_StackTraceElement::fileName_offset;
  int java_lang_StackTraceElement::lineNumber_offset;
  int java_lang_StackTraceElement::moduleName_offset;
  int java_lang_StackTraceElement::moduleVersion_offset;
+ int java_lang_StackTraceElement::classLoaderName_offset;
+ int java_lang_StackTraceElement::declaringClass_offset;
+ int java_lang_StackTraceElement::classOrLoaderModuleClassName_offset;
  int java_lang_StackFrameInfo::_declaringClass_offset;
  int java_lang_StackFrameInfo::_memberName_offset;
  int java_lang_StackFrameInfo::_bci_offset;
  int java_lang_StackFrameInfo::_version_offset;
  int java_lang_LiveStackFrameInfo::_monitors_offset;
*** 3667,3676 ****
--- 3686,3703 ----
  
  void java_lang_StackTraceElement::set_moduleVersion(oop element, oop value) {
    element->obj_field_put(moduleVersion_offset, value);
  }
  
+ void java_lang_StackTraceElement::set_classLoaderName(oop element, oop value) {
+   element->obj_field_put(classLoaderName_offset, value);
+ }
+ 
+ void java_lang_StackTraceElement::set_declaringClassObject(oop element, oop value) {
+   element->obj_field_put(classOrLoaderModuleClassName_offset, value);
+ }
+ 
  // Support for java_lang_StackFrameInfo
  void java_lang_StackFrameInfo::set_declaringClass(oop element, oop value) {
    element->obj_field_put(_declaringClass_offset, value);
  }
  
*** 3782,3791 ****
--- 3809,3820 ----
    java_lang_System::static_out_offset = java_lang_System::hc_static_out_offset * x;
    java_lang_System::static_err_offset = java_lang_System::hc_static_err_offset * x;
    java_lang_System::static_security_offset = java_lang_System::hc_static_security_offset * x;
  
    // java_lang_StackTraceElement
+   java_lang_StackTraceElement::classOrLoaderModuleClassName_offset= java_lang_StackTraceElement::hc_classOrLoaderModuleClassName_offset* x + header;
+   java_lang_StackTraceElement::classLoaderName_offset = java_lang_StackTraceElement::hc_classLoaderName_offset * x + header;
    java_lang_StackTraceElement::moduleName_offset = java_lang_StackTraceElement::hc_moduleName_offset * x + header;
    java_lang_StackTraceElement::moduleVersion_offset = java_lang_StackTraceElement::hc_moduleVersion_offset * x + header;
    java_lang_StackTraceElement::declaringClass_offset = java_lang_StackTraceElement::hc_declaringClass_offset  * x + header;
    java_lang_StackTraceElement::methodName_offset = java_lang_StackTraceElement::hc_methodName_offset * x + header;
    java_lang_StackTraceElement::fileName_offset   = java_lang_StackTraceElement::hc_fileName_offset   * x + header;
*** 3983,3992 ****
--- 4012,4025 ----
    CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, err, "Ljava/io/PrintStream;");
    CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, security, "Ljava/lang/SecurityManager;");
  
    // java.lang.StackTraceElement
  
+   CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, classOrLoaderModuleClassName, "Ljava/lang/Object;");
+   CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, classLoaderName, "Ljava/lang/String;");
+   CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, moduleName,      "Ljava/lang/String;");
+   CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, moduleVersion,   "Ljava/lang/String;");
    CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, declaringClass,  "Ljava/lang/String;");
    CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, methodName,      "Ljava/lang/String;");
    CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, fileName,        "Ljava/lang/String;");
    CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, lineNumber,      "I");