changeset 53674:19b15ff2576b

8214208: Nestmate package validation logging/exception should include classloader information Reviewed-by: hseigel, coleenp, mchung
author dholmes
date Tue, 27 Nov 2018 21:20:16 -0500
parents 53a407ab6d22
children 4b427f2653f1
files src/hotspot/share/oops/instanceKlass.cpp test/hotspot/jtreg/runtime/Nestmates/membership/TestNestmateMembership.java test/jdk/java/lang/reflect/Nestmates/TestReflectionAPI.java
diffstat 3 files changed, 95 insertions(+), 89 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/share/oops/instanceKlass.cpp	Tue Nov 27 19:46:57 2018 -0500
+++ b/src/hotspot/share/oops/instanceKlass.cpp	Tue Nov 27 21:20:16 2018 -0500
@@ -284,19 +284,25 @@
 
       if (log_is_enabled(Trace, class, nestmates)) {
         ResourceMark rm(THREAD);
-        log_trace(class, nestmates)("Type %s is not a nest member of resolved type %s: %s",
-                                    this->external_name(),
-                                    k->external_name(),
-                                    error);
+        log_trace(class, nestmates)
+          ("Type %s (loader: %s) is not a nest member of "
+           "resolved type %s (loader: %s): %s",
+           this->external_name(),
+           this->class_loader_data()->loader_name_and_id(),
+           k->external_name(),
+           k->class_loader_data()->loader_name_and_id(),
+           error);
       }
 
       if (validationException != NULL) {
         ResourceMark rm(THREAD);
         Exceptions::fthrow(THREAD_AND_LOCATION,
                            validationException,
-                           "Type %s is not a nest member of %s: %s",
+                           "Type %s (loader: %s) is not a nest member of %s (loader: %s): %s",
                            this->external_name(),
+                           this->class_loader_data()->loader_name_and_id(),
                            k->external_name(),
+                           k->class_loader_data()->loader_name_and_id(),
                            error
                            );
       }
--- a/test/hotspot/jtreg/runtime/Nestmates/membership/TestNestmateMembership.java	Tue Nov 27 19:46:57 2018 -0500
+++ b/test/hotspot/jtreg/runtime/Nestmates/membership/TestNestmateMembership.java	Tue Nov 27 21:20:16 2018 -0500
@@ -719,8 +719,8 @@
 
     static void test_SelfHostInvoke() throws Throwable {
         System.out.println("Testing for class that lists itself as nest-host");
-        String msg = "Type TestNestmateMembership$TargetSelfHost is not a nest member" +
-            " of TestNestmateMembership$TargetSelfHost: current type is not listed as a nest member";
+        String msg = "Type TestNestmateMembership$TargetSelfHost (loader: 'app') is not a nest member" +
+            " of TestNestmateMembership$TargetSelfHost (loader: 'app'): current type is not listed as a nest member";
         try {
             Caller.invokeTargetSelfHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -744,8 +744,8 @@
             check_expected(expected, msg);
         }
 
-        msg = "Type TestNestmateMembership$CallerSelfHost is not a nest member" +
-            " of TestNestmateMembership$CallerSelfHost: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerSelfHost (loader: 'app') is not a nest member" +
+            " of TestNestmateMembership$CallerSelfHost (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerSelfHost.invokeTarget();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -753,8 +753,8 @@
         catch (IncompatibleClassChangeError expected) {
             check_expected(expected, msg);
         }
-        msg = "Type TestNestmateMembership$CallerSelfHost is not a nest member" +
-            " of TestNestmateMembership$CallerSelfHost: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerSelfHost (loader: 'app') is not a nest member" +
+            " of TestNestmateMembership$CallerSelfHost (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerSelfHost.invokeTargetSelfHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -824,8 +824,8 @@
 
     static void test_NotInstanceHostInvoke() throws Throwable {
         System.out.println("Testing for nest-host class that is not an instance class");
-        String msg = "Type TestNestmateMembership$TargetNotInstanceHost is not a "+
-            "nest member of [LInvalidNestHost;: current type is not listed as a nest member";
+        String msg = "Type TestNestmateMembership$TargetNotInstanceHost (loader: 'app') is not a "+
+            "nest member of [LInvalidNestHost; (loader: 'app'): current type is not listed as a nest member";
         try {
             Caller.invokeTargetNotInstanceHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -849,8 +849,8 @@
             check_expected(expected, msg);
         }
 
-        msg = "Type TestNestmateMembership$CallerNotInstanceHost is not a "+
-            "nest member of [LInvalidNestHost;: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerNotInstanceHost (loader: 'app') is not a "+
+            "nest member of [LInvalidNestHost; (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerNotInstanceHost.invokeTarget();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -858,8 +858,8 @@
         catch (IncompatibleClassChangeError expected) {
             check_expected(expected, msg);
         }
-        msg = "Type TestNestmateMembership$CallerNotInstanceHost is not a "+
-            "nest member of [LInvalidNestHost;: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerNotInstanceHost (loader: 'app') is not a "+
+            "nest member of [LInvalidNestHost; (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerNotInstanceHost.invokeTargetNotInstanceHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -871,8 +871,8 @@
 
     static void test_NotOurHostInvoke() throws Throwable {
         System.out.println("Testing for nest-host class that does not list us in its nest");
-        String msg = "Type TestNestmateMembership$TargetNotOurHost is not a nest member" +
-            " of InvalidNestHost: current type is not listed as a nest member";
+        String msg = "Type TestNestmateMembership$TargetNotOurHost (loader: 'app') is not a nest member" +
+            " of InvalidNestHost (loader: 'app'): current type is not listed as a nest member";
         try {
             Caller.invokeTargetNotOurHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -896,8 +896,8 @@
             check_expected(expected, msg);
         }
 
-        msg = "Type TestNestmateMembership$CallerNotOurHost is not a nest member" +
-            " of InvalidNestHost: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerNotOurHost (loader: 'app') is not a nest member" +
+            " of InvalidNestHost (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerNotOurHost.invokeTarget();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -905,8 +905,8 @@
         catch (IncompatibleClassChangeError expected) {
             check_expected(expected, msg);
         }
-        msg = "Type TestNestmateMembership$CallerNotOurHost is not a nest member" +
-            " of InvalidNestHost: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerNotOurHost (loader: 'app') is not a nest member" +
+            " of InvalidNestHost (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerNotOurHost.invokeTargetNotOurHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -918,8 +918,8 @@
 
     static void test_WrongPackageHostInvoke() {
         System.out.println("Testing for nest-host and nest-member in different packages");
-        String msg = "Type P2.PackagedNestHost2$Member is not a nest member of " +
-            "P1.PackagedNestHost: types are in different packages";
+        String msg = "Type P2.PackagedNestHost2$Member (loader: 'app') is not a nest member of " +
+            "P1.PackagedNestHost (loader: 'app'): types are in different packages";
         try {
             P1.PackagedNestHost.doInvoke();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -998,8 +998,8 @@
 
     static void test_SelfHostConstruct() throws Throwable {
         System.out.println("Testing for class that lists itself as nest-host");
-        String msg = "Type TestNestmateMembership$TargetSelfHost is not a nest member" +
-            " of TestNestmateMembership$TargetSelfHost: current type is not listed as a nest member";
+        String msg = "Type TestNestmateMembership$TargetSelfHost (loader: 'app') is not a nest member" +
+            " of TestNestmateMembership$TargetSelfHost (loader: 'app'): current type is not listed as a nest member";
         try {
             Caller.newTargetSelfHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1023,8 +1023,8 @@
             check_expected(expected, msg);
         }
 
-        msg = "Type TestNestmateMembership$CallerSelfHost is not a nest member" +
-            " of TestNestmateMembership$CallerSelfHost: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerSelfHost (loader: 'app') is not a nest member" +
+            " of TestNestmateMembership$CallerSelfHost (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerSelfHost.newTarget();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1032,8 +1032,8 @@
         catch (IncompatibleClassChangeError expected) {
             check_expected(expected, msg);
         }
-        msg = "Type TestNestmateMembership$CallerSelfHost is not a nest member" +
-            " of TestNestmateMembership$CallerSelfHost: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerSelfHost (loader: 'app') is not a nest member" +
+            " of TestNestmateMembership$CallerSelfHost (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerSelfHost.newTargetSelfHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1095,8 +1095,8 @@
 
     static void test_NotInstanceHostConstruct() throws Throwable {
         System.out.println("Testing for nest-host class that is not an instance class");
-        String msg = "Type TestNestmateMembership$TargetNotInstanceHost is not a "+
-            "nest member of [LInvalidNestHost;: current type is not listed as a nest member";
+        String msg = "Type TestNestmateMembership$TargetNotInstanceHost (loader: 'app') is not a "+
+            "nest member of [LInvalidNestHost; (loader: 'app'): current type is not listed as a nest member";
         try {
             Caller.newTargetNotInstanceHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1120,8 +1120,8 @@
             check_expected(expected, msg);
         }
 
-        msg = "Type TestNestmateMembership$CallerNotInstanceHost is not a "+
-            "nest member of [LInvalidNestHost;: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerNotInstanceHost (loader: 'app') is not a "+
+            "nest member of [LInvalidNestHost; (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerNotInstanceHost.newTarget();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1129,8 +1129,8 @@
         catch (IncompatibleClassChangeError expected) {
             check_expected(expected, msg);
         }
-        msg = "Type TestNestmateMembership$CallerNotInstanceHost is not a "+
-            "nest member of [LInvalidNestHost;: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerNotInstanceHost (loader: 'app') is not a "+
+            "nest member of [LInvalidNestHost; (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerNotInstanceHost.newTargetNotInstanceHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1142,8 +1142,8 @@
 
     static void test_NotOurHostConstruct() throws Throwable {
         System.out.println("Testing for nest-host class that does not list us in its nest");
-        String msg = "Type TestNestmateMembership$TargetNotOurHost is not a nest member" +
-            " of InvalidNestHost: current type is not listed as a nest member";
+        String msg = "Type TestNestmateMembership$TargetNotOurHost (loader: 'app') is not a nest member" +
+            " of InvalidNestHost (loader: 'app'): current type is not listed as a nest member";
         try {
             Caller.newTargetNotOurHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1167,8 +1167,8 @@
             check_expected(expected, msg);
         }
 
-        msg = "Type TestNestmateMembership$CallerNotOurHost is not a nest member" +
-            " of InvalidNestHost: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerNotOurHost (loader: 'app') is not a nest member" +
+            " of InvalidNestHost (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerNotOurHost.newTarget();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1176,8 +1176,8 @@
         catch (IncompatibleClassChangeError expected) {
             check_expected(expected, msg);
         }
-        msg = "Type TestNestmateMembership$CallerNotOurHost is not a nest member" +
-            " of InvalidNestHost: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerNotOurHost (loader: 'app') is not a nest member" +
+            " of InvalidNestHost (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerNotOurHost.newTargetNotOurHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1189,8 +1189,8 @@
 
     static void test_WrongPackageHostConstruct() {
         System.out.println("Testing for nest-host and nest-member in different packages");
-        String msg = "Type P2.PackagedNestHost2$Member is not a nest member of " +
-            "P1.PackagedNestHost: types are in different packages";
+        String msg = "Type P2.PackagedNestHost2$Member (loader: 'app') is not a nest member of " +
+            "P1.PackagedNestHost (loader: 'app'): types are in different packages";
         try {
             P1.PackagedNestHost.doConstruct();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1269,8 +1269,8 @@
 
     static void test_SelfHostGetField() throws Throwable {
         System.out.println("Testing for class that lists itself as nest-host");
-        String msg = "Type TestNestmateMembership$TargetSelfHost is not a nest member" +
-            " of TestNestmateMembership$TargetSelfHost: current type is not listed as a nest member";
+        String msg = "Type TestNestmateMembership$TargetSelfHost (loader: 'app') is not a nest member" +
+            " of TestNestmateMembership$TargetSelfHost (loader: 'app'): current type is not listed as a nest member";
         try {
             Caller.getFieldTargetSelfHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1293,8 +1293,8 @@
             check_expected(expected, msg);
         }
 
-        msg = "Type TestNestmateMembership$CallerSelfHost is not a nest member" +
-            " of TestNestmateMembership$CallerSelfHost: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerSelfHost (loader: 'app') is not a nest member" +
+            " of TestNestmateMembership$CallerSelfHost (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerSelfHost.getFieldTarget();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1302,8 +1302,8 @@
         catch (IncompatibleClassChangeError expected) {
             check_expected(expected, msg);
         }
-        msg = "Type TestNestmateMembership$CallerSelfHost is not a nest member" +
-            " of TestNestmateMembership$CallerSelfHost: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerSelfHost (loader: 'app') is not a nest member" +
+            " of TestNestmateMembership$CallerSelfHost (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerSelfHost.getFieldTargetSelfHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1364,8 +1364,8 @@
 
     static void test_NotInstanceHostGetField() throws Throwable {
         System.out.println("Testing for nest-host class that is not an instance class");
-        String msg = "Type TestNestmateMembership$TargetNotInstanceHost is not a "+
-            "nest member of [LInvalidNestHost;: current type is not listed as a nest member";
+        String msg = "Type TestNestmateMembership$TargetNotInstanceHost (loader: 'app') is not a "+
+            "nest member of [LInvalidNestHost; (loader: 'app'): current type is not listed as a nest member";
         try {
             Caller.getFieldTargetNotInstanceHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1388,8 +1388,8 @@
             check_expected(expected, msg);
         }
 
-        msg = "Type TestNestmateMembership$CallerNotInstanceHost is not a "+
-            "nest member of [LInvalidNestHost;: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerNotInstanceHost (loader: 'app') is not a "+
+            "nest member of [LInvalidNestHost; (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerNotInstanceHost.getFieldTarget();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1397,8 +1397,8 @@
         catch (IncompatibleClassChangeError expected) {
             check_expected(expected, msg);
         }
-        msg = "Type TestNestmateMembership$CallerNotInstanceHost is not a "+
-            "nest member of [LInvalidNestHost;: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerNotInstanceHost (loader: 'app') is not a "+
+            "nest member of [LInvalidNestHost; (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerNotInstanceHost.getFieldTargetNotInstanceHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1410,8 +1410,8 @@
 
     static void test_NotOurHostGetField() throws Throwable {
         System.out.println("Testing for nest-host class that does not list us in its nest");
-        String msg = "Type TestNestmateMembership$TargetNotOurHost is not a nest member" +
-            " of InvalidNestHost: current type is not listed as a nest member";
+        String msg = "Type TestNestmateMembership$TargetNotOurHost (loader: 'app') is not a nest member" +
+            " of InvalidNestHost (loader: 'app'): current type is not listed as a nest member";
         try {
             Caller.getFieldTargetNotOurHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1434,8 +1434,8 @@
             check_expected(expected, msg);
         }
 
-        msg = "Type TestNestmateMembership$CallerNotOurHost is not a nest member" +
-            " of InvalidNestHost: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerNotOurHost (loader: 'app') is not a nest member" +
+            " of InvalidNestHost (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerNotOurHost.getFieldTarget();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1443,8 +1443,8 @@
         catch (IncompatibleClassChangeError expected) {
             check_expected(expected, msg);
         }
-        msg = "Type TestNestmateMembership$CallerNotOurHost is not a nest member" +
-            " of InvalidNestHost: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerNotOurHost (loader: 'app') is not a nest member" +
+            " of InvalidNestHost (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerNotOurHost.getFieldTargetNotOurHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1456,8 +1456,8 @@
 
     static void test_WrongPackageHostGetField() {
         System.out.println("Testing for nest-host and nest-member in different packages");
-        String msg = "Type P2.PackagedNestHost2$Member is not a nest member of " +
-            "P1.PackagedNestHost: types are in different packages";
+        String msg = "Type P2.PackagedNestHost2$Member (loader: 'app') is not a nest member of " +
+            "P1.PackagedNestHost (loader: 'app'): types are in different packages";
         try {
             P1.PackagedNestHost.doGetField();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1534,8 +1534,8 @@
 
     static void test_SelfHostPutField() throws Throwable {
         System.out.println("Testing for class that lists itself as nest-host");
-        String msg = "Type TestNestmateMembership$TargetSelfHost is not a nest member" +
-            " of TestNestmateMembership$TargetSelfHost: current type is not listed as a nest member";
+        String msg = "Type TestNestmateMembership$TargetSelfHost (loader: 'app') is not a nest member" +
+            " of TestNestmateMembership$TargetSelfHost (loader: 'app'): current type is not listed as a nest member";
         try {
             Caller.putFieldTargetSelfHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1558,8 +1558,8 @@
             check_expected(expected, msg);
         }
 
-        msg = "Type TestNestmateMembership$CallerSelfHost is not a nest member" +
-            " of TestNestmateMembership$CallerSelfHost: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerSelfHost (loader: 'app') is not a nest member" +
+            " of TestNestmateMembership$CallerSelfHost (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerSelfHost.putFieldTarget();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1567,8 +1567,8 @@
         catch (IncompatibleClassChangeError expected) {
             check_expected(expected, msg);
         }
-        msg = "Type TestNestmateMembership$CallerSelfHost is not a nest member" +
-            " of TestNestmateMembership$CallerSelfHost: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerSelfHost (loader: 'app') is not a nest member" +
+            " of TestNestmateMembership$CallerSelfHost (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerSelfHost.putFieldTargetSelfHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1629,8 +1629,8 @@
 
     static void test_NotInstanceHostPutField() throws Throwable {
         System.out.println("Testing for nest-host class that is not an instance class");
-        String msg = "Type TestNestmateMembership$TargetNotInstanceHost is not a "+
-            "nest member of [LInvalidNestHost;: current type is not listed as a nest member";
+        String msg = "Type TestNestmateMembership$TargetNotInstanceHost (loader: 'app') is not a "+
+            "nest member of [LInvalidNestHost; (loader: 'app'): current type is not listed as a nest member";
         try {
             Caller.putFieldTargetNotInstanceHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1653,8 +1653,8 @@
             check_expected(expected, msg);
         }
 
-        msg = "Type TestNestmateMembership$CallerNotInstanceHost is not a "+
-            "nest member of [LInvalidNestHost;: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerNotInstanceHost (loader: 'app') is not a "+
+            "nest member of [LInvalidNestHost; (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerNotInstanceHost.putFieldTarget();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1662,8 +1662,8 @@
         catch (IncompatibleClassChangeError expected) {
             check_expected(expected, msg);
         }
-        msg = "Type TestNestmateMembership$CallerNotInstanceHost is not a "+
-            "nest member of [LInvalidNestHost;: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerNotInstanceHost (loader: 'app') is not a "+
+            "nest member of [LInvalidNestHost; (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerNotInstanceHost.putFieldTargetNotInstanceHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1675,8 +1675,8 @@
 
     static void test_NotOurHostPutField() throws Throwable {
         System.out.println("Testing for nest-host class that does not list us in its nest");
-        String msg = "Type TestNestmateMembership$TargetNotOurHost is not a nest member" +
-            " of InvalidNestHost: current type is not listed as a nest member";
+        String msg = "Type TestNestmateMembership$TargetNotOurHost (loader: 'app') is not a nest member" +
+            " of InvalidNestHost (loader: 'app'): current type is not listed as a nest member";
         try {
             Caller.putFieldTargetNotOurHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1699,8 +1699,8 @@
             check_expected(expected, msg);
         }
 
-        msg = "Type TestNestmateMembership$CallerNotOurHost is not a nest member" +
-            " of InvalidNestHost: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerNotOurHost (loader: 'app') is not a nest member" +
+            " of InvalidNestHost (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerNotOurHost.putFieldTarget();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1708,8 +1708,8 @@
         catch (IncompatibleClassChangeError expected) {
             check_expected(expected, msg);
         }
-        msg = "Type TestNestmateMembership$CallerNotOurHost is not a nest member" +
-            " of InvalidNestHost: current type is not listed as a nest member";
+        msg = "Type TestNestmateMembership$CallerNotOurHost (loader: 'app') is not a nest member" +
+            " of InvalidNestHost (loader: 'app'): current type is not listed as a nest member";
         try {
             CallerNotOurHost.putFieldTargetNotOurHost();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
@@ -1721,8 +1721,8 @@
 
     static void test_WrongPackageHostPutField() {
         System.out.println("Testing for nest-host and nest-member in different packages");
-        String msg = "Type P2.PackagedNestHost2$Member is not a nest member of " +
-            "P1.PackagedNestHost: types are in different packages";
+        String msg = "Type P2.PackagedNestHost2$Member (loader: 'app') is not a nest member of " +
+            "P1.PackagedNestHost (loader: 'app'): types are in different packages";
         try {
             P1.PackagedNestHost.doPutField();
             throw new Error("Missing IncompatibleClassChangeError: " + msg);
--- a/test/jdk/java/lang/reflect/Nestmates/TestReflectionAPI.java	Tue Nov 27 19:46:57 2018 -0500
+++ b/test/jdk/java/lang/reflect/Nestmates/TestReflectionAPI.java	Tue Nov 27 21:20:16 2018 -0500
@@ -196,10 +196,10 @@
             "declares a different nest host of HostOfMemberNoHost$MemberNoHost",
             "Unable to load nest-host class (NestHost) of " +
             "HostOfMemberMissingHost$MemberMissingHost",
-            "Type HostOfMemberNotOurHost$MemberNotOurHost is not a nest member " +
-            "of InvalidNestHost: current type is not listed as a nest member",
-            "Type HostOfMemberNotInstanceHost$MemberNotInstanceHost is not a nest " +
-            "member of [LInvalidNestHost;: current type is not listed as a nest member",
+            "Type HostOfMemberNotOurHost$MemberNotOurHost (loader: 'app') is not a nest member " +
+            "of InvalidNestHost (loader: 'app'): current type is not listed as a nest member",
+            "Type HostOfMemberNotInstanceHost$MemberNotInstanceHost (loader: 'app') is not a nest " +
+            "member of [LInvalidNestHost; (loader: 'app'): current type is not listed as a nest member",
             "Incompatible magic value 3735928559 in class file MalformedHost",
         };
         for (int i = 0; i < bad.length; i++) {