--- 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),