Mercurial > hg > graal-jvmci-8
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiManageCapabilities.cpp Thu Oct 16 10:21:29 2014 +0200 +++ b/src/share/vm/prims/jvmtiManageCapabilities.cpp Wed Oct 15 16:02:50 2014 +0200 @@ -117,10 +117,10 @@ jvmtiCapabilities jc; memset(&jc, 0, sizeof(jc)); -#ifndef CC_INTERP +#ifndef ZERO jc.can_pop_frame = 1; jc.can_force_early_return = 1; -#endif // !CC_INTERP +#endif // !ZERO jc.can_get_source_debug_extension = 1; jc.can_access_local_variables = 1; jc.can_maintain_original_method_order = 1;