comparison src/share/vm/prims/jvmtiManageCapabilities.cpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 4ca6dc0799b6
children
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
115 115
116 jvmtiCapabilities JvmtiManageCapabilities::init_onload_capabilities() { 116 jvmtiCapabilities JvmtiManageCapabilities::init_onload_capabilities() {
117 jvmtiCapabilities jc; 117 jvmtiCapabilities jc;
118 118
119 memset(&jc, 0, sizeof(jc)); 119 memset(&jc, 0, sizeof(jc));
120 #ifndef CC_INTERP 120 #ifndef ZERO
121 jc.can_pop_frame = 1; 121 jc.can_pop_frame = 1;
122 jc.can_force_early_return = 1; 122 jc.can_force_early_return = 1;
123 #endif // !CC_INTERP 123 #endif // !ZERO
124 jc.can_get_source_debug_extension = 1; 124 jc.can_get_source_debug_extension = 1;
125 jc.can_access_local_variables = 1; 125 jc.can_access_local_variables = 1;
126 jc.can_maintain_original_method_order = 1; 126 jc.can_maintain_original_method_order = 1;
127 jc.can_generate_all_class_hook_events = 1; 127 jc.can_generate_all_class_hook_events = 1;
128 jc.can_generate_single_step_events = 1; 128 jc.can_generate_single_step_events = 1;