--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp Fri May 08 10:34:31 2009 -0700
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp Fri May 08 10:44:20 2009 -0700
@@ -1064,7 +1064,7 @@
void LIRGenerator::do_Return(Return* x) {
- if (DTraceMethodProbes) {
+ if (compilation()->env()->dtrace_method_probes()) {
BasicTypeList signature;
signature.append(T_INT); // thread
signature.append(T_OBJECT); // methodOop
@@ -1769,7 +1769,7 @@
__ null_check(exception_opr, new CodeEmitInfo(info, true));
}
- if (JvmtiExport::can_post_exceptions() &&
+ if (compilation()->env()->jvmti_can_post_exceptions() &&
!block()->is_set(BlockBegin::default_exception_handler_flag)) {
// we need to go through the exception lookup path to get JVMTI
// notification done
@@ -1779,7 +1779,7 @@
assert(!block()->is_set(BlockBegin::default_exception_handler_flag) || unwind,
"should be no more handlers to dispatch to");
- if (DTraceMethodProbes &&
+ if (compilation()->env()->dtrace_method_probes() &&
block()->is_set(BlockBegin::default_exception_handler_flag)) {
// notify that this frame is unwinding
BasicTypeList signature;
@@ -2204,7 +2204,7 @@
java_index += type2size[t];
}
- if (DTraceMethodProbes) {
+ if (compilation()->env()->dtrace_method_probes()) {
BasicTypeList signature;
signature.append(T_INT); // thread
signature.append(T_OBJECT); // methodOop