diff -r ae1ca3bf45ca -r 157314902d78 hotspot/src/share/vm/utilities/xmlstream.cpp
--- a/hotspot/src/share/vm/utilities/xmlstream.cpp	Mon Jan 12 11:37:58 2015 -0800
+++ b/hotspot/src/share/vm/utilities/xmlstream.cpp	Tue Jan 13 14:30:53 2015 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, 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
@@ -33,6 +33,10 @@
 #include "runtime/vmThread.hpp"
 #include "utilities/xmlstream.hpp"
 
+// Do not assert this condition if there's already another error reported.
+#define assert_if_no_error(cond, msg) \
+  vmassert((cond) || is_error_reported(), msg)
+
 void xmlStream::initialize(outputStream* out) {
   _out = out;
   _last_flush = 0;