diff -r 6061df52d610 -r 53ccc37bda19 hotspot/src/share/vm/utilities/xmlstream.hpp
--- a/hotspot/src/share/vm/utilities/xmlstream.hpp	Wed Mar 15 11:44:46 2017 +0100
+++ b/hotspot/src/share/vm/utilities/xmlstream.hpp	Wed Mar 15 10:25:37 2017 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, 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
@@ -138,14 +138,14 @@
   // commonly used XML attributes
   void          stamp();                 // stamp='1.234'
   void          method(methodHandle m);  // method='k n s' ...
-  void          klass(KlassHandle k);    // klass='name'
+  void          klass(Klass* k);         // klass='name'
   void          name(const Symbol* s);   // name='name'
   void          object(const char* attr, Metadata* val);
   void          object(const char* attr, Handle val);
 
   // print the text alone (sans ''):
   void          method_text(methodHandle m);
-  void          klass_text(KlassHandle k);    // klass='name'
+  void          klass_text(Klass* k);         // klass='name'
   void          name_text(const Symbol* s);   // name='name'
   void          object_text(Metadata* x);
   void          object_text(Handle x);