From 3f473f88984bc8aff76af1cdbe4b61a578a92cd3 Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 14 Jul 2015 17:36:36 +0000 Subject: * vm_core.h, vm.c: remvoe rb_env_t::prev_envval because we can know it via env->ep. rb_vm_env_prev_envval(env) returns prev_envval via env->ep. * vm_core.h (rb_vm_env_local_variables): change parameter type from VALUE (T_DATA/env) to `const rb_env_t *' to make same as rb_vm_env_prev_envval(). * proc.c: catch up these changes. * vm_dump.c: ditto. * vm.c: rename macros. * ENV_IN_HEAP_P() to VM_EP_IN_HEAP_P() because it uses ep. * ENV_VAL() to VM_ENV_EP_ENVVAL() because it is too short. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51245 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_dump.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'vm_dump.c') diff --git a/vm_dump.c b/vm_dump.c index 0408992f6d..714bee62ea 100644 --- a/vm_dump.c +++ b/vm_dump.c @@ -185,6 +185,8 @@ rb_vmdebug_env_dump_raw(rb_env_t *env, VALUE *ep) fprintf(stderr, "-- env --------------------\n"); while (env) { + VALUE prev_envval; + fprintf(stderr, "--\n"); for (i = 0; i < env->env_size; i++) { fprintf(stderr, "%04d: %08"PRIxVALUE" (%p)", i, env->env[i], (void *)&env->env[i]); @@ -192,11 +194,11 @@ rb_vmdebug_env_dump_raw(rb_env_t *env, VALUE *ep) fprintf(stderr, "\n"); } - if (env->prev_envval != 0) { - GetEnvPtr(env->prev_envval, env); + if ((prev_envval = rb_vm_env_prev_envval(env)) != Qfalse) { + GetEnvPtr(prev_envval, env); } else { - env = 0; + env = NULL; } } fprintf(stderr, "---------------------------\n"); -- cgit v1.2.3