src/hotspot/share/oops/klassVtable.cpp

@@ -22,10 +22,11 @@
  *
  */
 
 #include "precompiled.hpp"
 #include "jvm.h"
+#include "classfile/javaClasses.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "interpreter/linkResolver.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"

@@ -507,21 +508,21 @@
               const char* msg = "loader constraint violation for class %s: when selecting "
                 "overriding method %s the class loader %s of the "
                 "selected method's type %s, and the class loader %s for its super "
                 "type %s have different Class objects for the type %s used in the signature";
               const char* curr_class = klass->external_name();
-              const char* sig = target_method()->name_and_sig_as_C_string();
+              const char* method = target_method()->name_and_sig_as_C_string();
               const char* loader1 = java_lang_ClassLoader::describe_external(target_loader());
               const char* sel_class = target_klass->external_name();
               const char* loader2 = java_lang_ClassLoader::describe_external(super_loader());
               const char* super_class = super_klass->external_name();
-              char* failed_type_name = failed_type_symbol->as_C_string();
-              size_t buflen = strlen(msg) + strlen(curr_class) + strlen(sig) +
+              const char* failed_type_name = failed_type_symbol->as_klass_external_name();
+              size_t buflen = strlen(msg) + strlen(curr_class) + strlen(method) +
                 strlen(loader1) + strlen(sel_class) + strlen(loader2) +
                 strlen(super_class) + strlen(failed_type_name);
               char* buf = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, buflen);
-              jio_snprintf(buf, buflen, msg, curr_class, sig, loader1, sel_class, loader2,
+              jio_snprintf(buf, buflen, msg, curr_class, method, loader1, sel_class, loader2,
                            super_class, failed_type_name);
               THROW_MSG_(vmSymbols::java_lang_LinkageError(), buf, false);
             }
           }
         }

@@ -1243,11 +1244,11 @@
             const char* sig = m->name_and_sig_as_C_string();
             const char* loader1 = java_lang_ClassLoader::describe_external(interface_loader());
             const char* iface = InstanceKlass::cast(interf)->external_name();
             const char* loader2 = java_lang_ClassLoader::describe_external(method_holder_loader());
             const char* mclass = target()->method_holder()->external_name();
-            const char* failed_type_name = failed_type_symbol->as_C_string();
+            const char* failed_type_name = failed_type_symbol->as_klass_external_name();
             size_t buflen = strlen(msg) + strlen(current) + strlen(sig) +
               strlen(loader1) + strlen(iface) + strlen(loader2) + strlen(mclass) +
               strlen(failed_type_name);
             char* buf = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, buflen);
             jio_snprintf(buf, buflen, msg, current, sig, loader1, iface,