From 78c1041a8214931924fe7e60feee62f59e0b4866 Mon Sep 17 00:00:00 2001 From: ko1 Date: Thu, 28 Jul 2016 19:27:52 +0000 Subject: [PATCH] * vm_core.h (VM_ENV_LOCAL_P): return truthy (0 or not) value. * vm.c (rb_vm_make_proc_lambda): use VM_ENV_ESCAPED_P() macro. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55770 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ vm.c | 2 +- vm_core.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4ddcbe2fc0..6547ec472e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Jul 29 04:23:08 2016 Koichi Sasada + + * vm_core.h (VM_ENV_LOCAL_P): return truthy (0 or not) value. + + * vm.c (rb_vm_make_proc_lambda): use VM_ENV_ESCAPED_P() macro. + Fri Jul 29 03:49:04 2016 Koichi Sasada * vm.c, internal.h: remove RubyVM::Env class and all of env objects diff --git a/vm.c b/vm.c index ef28ce496f..6f9a7f8a3d 100644 --- a/vm.c +++ b/vm.c @@ -865,7 +865,7 @@ rb_vm_make_proc_lambda(rb_thread_t *th, const struct rb_captured_block *captured { VALUE procval; - if (!VM_ENV_FLAGS(captured->ep, VM_ENV_FLAG_ESCAPED)) { + if (!VM_ENV_ESCAPED_P(captured->ep)) { rb_control_frame_t *cfp = VM_CAPTURED_BLOCK_TO_CFP(captured); vm_make_env_object(th, cfp); } diff --git a/vm_core.h b/vm_core.h index be163278f4..4da28e5966 100644 --- a/vm_core.h +++ b/vm_core.h @@ -1039,7 +1039,7 @@ VM_FRAME_TYPE(const rb_control_frame_t *cfp) static inline int VM_ENV_LOCAL_P(const VALUE *ep) { - return VM_ENV_FLAGS(ep, VM_ENV_FLAG_LOCAL) ? 1 : 0; + return VM_ENV_FLAGS(ep, VM_ENV_FLAG_LOCAL); } static inline const VALUE *