src/share/vm/ci/ciEnv.cpp

rev 1178 : merge with cd37471eaecc from http://hg.openjdk.java.net/jdk7/hotspot-comp/hotspot

@@ -176,11 +176,11 @@
   // Get Jvmti capabilities under lock to get consistant values.
   MutexLocker mu(JvmtiThreadState_lock);
   _jvmti_can_hotswap_or_post_breakpoint = JvmtiExport::can_hotswap_or_post_breakpoint();
   _jvmti_can_examine_or_deopt_anywhere  = JvmtiExport::can_examine_or_deopt_anywhere();
   _jvmti_can_access_local_variables     = JvmtiExport::can_access_local_variables();
-  _jvmti_can_post_exceptions            = JvmtiExport::can_post_exceptions();
+  _jvmti_can_post_on_exceptions            = JvmtiExport::can_post_on_exceptions();
 }
 
 // ------------------------------------------------------------------
 // Cache DTrace flags
 void ciEnv::cache_dtrace_flags() {

@@ -889,12 +889,12 @@
            JvmtiExport::can_hotswap_or_post_breakpoint()) ||
           (!jvmti_can_examine_or_deopt_anywhere() &&
            JvmtiExport::can_examine_or_deopt_anywhere()) ||
           (!jvmti_can_access_local_variables() &&
            JvmtiExport::can_access_local_variables()) ||
-          (!jvmti_can_post_exceptions() &&
-           JvmtiExport::can_post_exceptions()) )) {
+          (!jvmti_can_post_on_exceptions() &&
+           JvmtiExport::can_post_on_exceptions()) )) {
       record_failure("Jvmti state change invalidated dependencies");
     }
 
     // Change in DTrace flags may invalidate compilation.
     if (!failing() &&