diff src/share/vm/prims/jvmtiThreadState.hpp @ 4970:33df1aeaebbf

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents af739d5ab23c
children d2a62e0f25eb
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiThreadState.hpp	Fri Feb 24 18:30:42 2012 -0800
+++ b/src/share/vm/prims/jvmtiThreadState.hpp	Mon Feb 27 13:10:13 2012 +0100
@@ -165,6 +165,10 @@
   inline bool is_exception_caught()    { return _exception_caught;  }
   inline void set_exception_detected() { _exception_detected = true;
                                          _exception_caught = false; }
+  inline void clear_exception_detected() {
+    _exception_detected = false;
+    assert(_exception_caught == false, "_exception_caught is out of phase");
+  }
   inline void set_exception_caught()   { _exception_caught = true;
                                          _exception_detected = false; }