hotspot/src/share/vm/utilities/xmlstream.cpp
changeset 46589 f1c04490ded1
parent 46329 53ccc37bda19
child 46727 6e4a84748e2c
equal deleted inserted replaced
46588:27a438928e38 46589:f1c04490ded1
    30 #include "oops/methodData.hpp"
    30 #include "oops/methodData.hpp"
    31 #include "oops/method.hpp"
    31 #include "oops/method.hpp"
    32 #include "oops/oop.inline.hpp"
    32 #include "oops/oop.inline.hpp"
    33 #include "runtime/deoptimization.hpp"
    33 #include "runtime/deoptimization.hpp"
    34 #include "runtime/vmThread.hpp"
    34 #include "runtime/vmThread.hpp"
       
    35 #include "utilities/vmError.hpp"
    35 #include "utilities/xmlstream.hpp"
    36 #include "utilities/xmlstream.hpp"
    36 
    37 
    37 // Do not assert this condition if there's already another error reported.
    38 // Do not assert this condition if there's already another error reported.
    38 #define assert_if_no_error(cond, msg) \
    39 #define assert_if_no_error(cond, msg) \
    39   vmassert((cond) || is_error_reported(), msg)
    40   vmassert((cond) || VMError::is_error_reported(), msg)
    40 
    41 
    41 void xmlStream::initialize(outputStream* out) {
    42 void xmlStream::initialize(outputStream* out) {
    42   _out = out;
    43   _out = out;
    43   _last_flush = 0;
    44   _last_flush = 0;
    44   _markup_state = BODY;
    45   _markup_state = BODY;
   196     // Pop the stack, by skipping over the tag and its null.
   197     // Pop the stack, by skipping over the tag and its null.
   197     _element_close_stack_ptr = cur_tag + strlen(cur_tag) + 1;
   198     _element_close_stack_ptr = cur_tag + strlen(cur_tag) + 1;
   198     _element_depth -= 1;
   199     _element_depth -= 1;
   199   }
   200   }
   200   if (bad_tag && !VMThread::should_terminate() && !VM_Exit::vm_exited() &&
   201   if (bad_tag && !VMThread::should_terminate() && !VM_Exit::vm_exited() &&
   201       !is_error_reported())
   202       !VMError::is_error_reported())
   202   {
   203   {
   203     assert(false, "bad tag in log");
   204     assert(false, "bad tag in log");
   204   }
   205   }
   205 }
   206 }
   206 #endif
   207 #endif