src/share/vm/utilities/xmlstream.cpp

*** 30,44 ****
  #include "oops/methodData.hpp"
  #include "oops/method.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/deoptimization.hpp"
  #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;
    _markup_state = BODY;
--- 30,45 ----
  #include "oops/methodData.hpp"
  #include "oops/method.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/deoptimization.hpp"
  #include "runtime/vmThread.hpp"
+ #include "utilities/vmError.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) || VMError::is_error_reported(), msg)
  
  void xmlStream::initialize(outputStream* out) {
    _out = out;
    _last_flush = 0;
    _markup_state = BODY;
*** 196,206 ****
      // Pop the stack, by skipping over the tag and its null.
      _element_close_stack_ptr = cur_tag + strlen(cur_tag) + 1;
      _element_depth -= 1;
    }
    if (bad_tag && !VMThread::should_terminate() && !VM_Exit::vm_exited() &&
!       !is_error_reported())
    {
      assert(false, "bad tag in log");
    }
  }
  #endif
--- 197,207 ----
      // Pop the stack, by skipping over the tag and its null.
      _element_close_stack_ptr = cur_tag + strlen(cur_tag) + 1;
      _element_depth -= 1;
    }
    if (bad_tag && !VMThread::should_terminate() && !VM_Exit::vm_exited() &&
!       !VMError::is_error_reported())
    {
      assert(false, "bad tag in log");
    }
  }
  #endif