diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-04-12 09:34:54 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-04-12 09:34:54 +0000 |
| commit | 37a92063f0f0d96bc51f2153c6446534f053e734 (patch) | |
| tree | 45bfa4a1f5ffd0e98a38843dd8011ad9e75bb839 /error.c | |
| parent | b4a256b07ea246da7a829716c26ab87be4ee6cc3 (diff) | |
| download | ruby-37a92063f0f0d96bc51f2153c6446534f053e734.tar.gz | |
error.c: fix for DRb
* error.c (name_err_init_attr): hide the receiver object from
Marshal, as DRb depends on it.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63137 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'error.c')
| -rw-r--r-- | error.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -888,7 +888,7 @@ static VALUE rb_eNOERROR; static ID id_cause, id_message, id_backtrace; static ID id_name, id_key, id_args, id_Errno, id_errno, id_i_path; -static ID id_receiver, id_iseq, id_local_variables; +static ID id_receiver, id_recv, id_iseq, id_local_variables; static ID id_private_call_p, id_top, id_bottom; #define id_bt idBt #define id_bt_locations idBt_locations @@ -1434,7 +1434,7 @@ name_err_init_attr(VALUE exc, VALUE recv, VALUE method) rb_control_frame_t *cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(ec->cfp); cfp = rb_vm_get_ruby_level_next_cfp(ec, cfp); rb_ivar_set(exc, id_name, method); - if (recv != Qundef) rb_ivar_set(exc, id_receiver, recv); + if (recv != Qundef) rb_ivar_set(exc, id_recv, recv); if (cfp) rb_ivar_set(exc, id_iseq, rb_iseqw_new(cfp->iseq)); return exc; } @@ -1700,7 +1700,7 @@ name_err_receiver(VALUE self) { VALUE *ptr, recv, mesg; - recv = rb_ivar_lookup(self, id_receiver, Qundef); + recv = rb_ivar_lookup(self, id_recv, Qundef); if (recv != Qundef) return recv; mesg = rb_attr_get(self, id_mesg); @@ -2516,6 +2516,7 @@ Init_Exception(void) id_top = rb_intern_const("top"); id_bottom = rb_intern_const("bottom"); id_iseq = rb_make_internal_id(); + id_recv = rb_make_internal_id(); } void |