From e7187862524523fe89ed9de9d392062d8c801d77 Mon Sep 17 00:00:00 2001 From: ko1 Date: Fri, 13 Nov 2015 20:02:19 +0000 Subject: * refactoring CREF related code. * eval_intern.h: remove unused setter functions. CREF_CLASS_SET() CREF_NEXT_SET() CREF_SCOPE_VISI_COPY() * eval_intern.h: rename flags: * NODE_FL_CREF_PUSHED_BY_EVAL_ -> CREF_FL_PUSHED_BY_EVAL * NODE_FL_CREF_OMOD_SHARED_ -> CREF_FL_OMOD_SHARED and use IMEMO_FL_USER1/2. * vm.c (vm_cref_new): accept push_by_eval parameter. * vm.c (vm_cref_new_use_prev): added for rb_vm_rewrite_cref(). * vm_insnhelper.c (vm_cref_push): accept pushed_by_eval parameter. * vm_insnhelper.h: remove unused macros: COPY_CREF_OMOD() and COPY_CREF(). * vm_eval.c, insns.def: catch up this fix. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_insnhelper.h | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'vm_insnhelper.h') diff --git a/vm_insnhelper.h b/vm_insnhelper.h index b70f731be1..fbd3a76728 100644 --- a/vm_insnhelper.h +++ b/vm_insnhelper.h @@ -121,25 +121,6 @@ enum vm_regan_acttype { /* deal with control flow 2: method/iterator */ /**********************************************************/ -#define COPY_CREF_OMOD(c1, c2) do { \ - CREF_REFINEMENTS_SET(c1, CREF_REFINEMENTS(c2)); \ - if (!NIL_P(CREF_REFINEMENTS(c2))) { \ - CREF_OMOD_SHARED_SET(c1); \ - CREF_OMOD_SHARED_SET(c2); \ - } \ -} while (0) - -#define COPY_CREF(c1, c2) do { \ - rb_cref_t *__tmp_c2 = (c2); \ - COPY_CREF_OMOD((c1), __tmp_c2); \ - CREF_CLASS_SET((c1), CREF_CLASS(__tmp_c2));\ - CREF_SCOPE_VISI_COPY((c1), __tmp_c2);\ - CREF_NEXT_SET((c1), CREF_NEXT(__tmp_c2));\ - if (CREF_PUSHED_BY_EVAL(__tmp_c2)) { \ - CREF_PUSHED_BY_EVAL_SET(c1); \ - } \ -} while (0) - #define CALL_METHOD(calling, ci, cc) do { \ VALUE v = (*(cc)->call)(th, GET_CFP(), (calling), (ci), (cc)); \ if (v == Qundef) { \ -- cgit v1.2.3