# HG changeset patch
# User goetz
# Date 1548228322 -3600
# Node ID fd0e3299326ddef09158d43682e2e6d40c0f9980
# Parent  80b55cf3a8048585c5baf9fd78297c7e7cba9905
8217512: Message of LinkageError: use 'class' etc. instead of 'type'
Reviewed-by: dholmes, lfoltan

diff -r 80b55cf3a804 -r fd0e3299326d src/hotspot/share/interpreter/linkResolver.cpp
--- a/src/hotspot/share/interpreter/linkResolver.cpp	Tue Jan 22 18:14:14 2019 -0800
+++ b/src/hotspot/share/interpreter/linkResolver.cpp	Wed Jan 23 08:25:22 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, 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
@@ -710,15 +710,16 @@
     stringStream ss;
     const char* failed_type_name = failed_type_symbol->as_klass_external_name();
 
-    ss.print("loader constraint violation: when resolving field"
-             " \"%s\" of type %s, the class loader %s of the current class, "
-             "%s, and the class loader %s for the field's defining "
-             "type, %s, have different Class objects for type %s (%s; %s)",
+    ss.print("loader constraint violation: when resolving field \"%s\" of type %s, "
+             "the class loader %s of the current class, %s, "
+             "and the class loader %s for the field's defining %s, %s, "
+             "have different Class objects for type %s (%s; %s)",
              field->as_C_string(),
              failed_type_name,
              current_klass->class_loader_data()->loader_name_and_id(),
              current_klass->external_name(),
              sel_klass->class_loader_data()->loader_name_and_id(),
+             sel_klass->external_kind(),
              sel_klass->external_name(),
              failed_type_name,
              current_klass->class_in_module_of_loader(false, true),
diff -r 80b55cf3a804 -r fd0e3299326d test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/LdrCnstrFldMsgTest.java
--- a/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/LdrCnstrFldMsgTest.java	Tue Jan 22 18:14:14 2019 -0800
+++ b/test/hotspot/jtreg/runtime/LoaderConstraints/ldrCnstrFldMsg/LdrCnstrFldMsgTest.java	Wed Jan 23 08:25:22 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -31,7 +31,7 @@
 
 import java.lang.reflect.Method;
 
-// Check that LinkageError loader constraint message for fields contains the
+// Check that the LinkageError loader constraint message for fields contains the
 // correct information.
 //
 // The test creates two class loaders.  The first class loader loads classes
@@ -40,6 +40,20 @@
 // Class Child tries to load Parent._field1.  This should fail because type Foo
 // for Parent._field1 is a different type than Child's Foo.
 //
+// Grand (ldr1)   has field _field1 of type Foo(ldr1)
+//  |
+// Parent (ldr2)  has field _field1 of type Foo(ldr2)
+//  |
+// Child (ldr1)
+//
+// java.lang.LinkageError: loader constraint violation:
+//   when resolving field "_field1" of type pkg.Foo,
+//   the class loader pkg.ClassLoaderForChildGrandFoo @42b2e259 of the current class, pkg.Child,
+//   and the class loader pkg.ClassLoaderForParentFoo @4b55c90f for the field's defining class, pkg.Parent,
+//   have different Class objects for type pkg.Foo
+//   (pkg.Child is in unnamed module of loader pkg.ClassLoaderForChildGrandFoo @42b2e259, parent loader 'app';
+//    pkg.Parent is in unnamed module of loader pkg.ClassLoaderForParentFoo @4b55c90f, parent loader 'app')
+//
 public class LdrCnstrFldMsgTest {
     public static void main(String... args) throws Exception {
         ClassLoader l = new pkg.ClassLoaderForChildGrandFoo("pkg.Foo", "pkg.Child", "pkg.Grand");
@@ -51,7 +65,7 @@
             r.run();
             throw new RuntimeException("Expected LinkageError exception not thrown");
         } catch (java.lang.LinkageError e) {
-            if (!e.getMessage().contains("for the field's defining type, pkg.Parent,") ||
+            if (!e.getMessage().contains("for the field's defining class, pkg.Parent,") ||
                 !e.getMessage().contains("have different Class objects for type pkg.Foo")) {
                 throw new RuntimeException("Wrong LinkageError exception thrown: " + e.toString());
             }