--- a/hotspot/src/share/vm/utilities/xmlstream.cpp	Wed Mar 15 11:44:46 2017 +0100
+++ b/hotspot/src/share/vm/utilities/xmlstream.cpp	Wed Mar 15 10:25:37 2017 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2017, 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
@@ -422,17 +422,17 @@
 // ------------------------------------------------------------------
 // Output a klass attribute, in the form " klass='pkg/cls'".
 // This is used only when there is no ciKlass available.
-void xmlStream::klass(KlassHandle klass) {
+void xmlStream::klass(Klass* klass) {
   assert_if_no_error(inside_attrs(), "printing attributes");
-  if (klass.is_null())  return;
+  if (klass == NULL) return;
   print_raw(" klass='");
   klass_text(klass);
   print_raw("'");
 }
 
-void xmlStream::klass_text(KlassHandle klass) {
+void xmlStream::klass_text(Klass* klass) {
   assert_if_no_error(inside_attrs(), "printing attributes");
-  if (klass.is_null())  return;
+  if (klass == NULL) return;
   //klass->print_short_name(log->out());
   klass->name()->print_symbol_on(out());
 }