From: Eric Wong <e@80x24.org>
To: misc@80x24.org
Cc: Eric Wong <e@80x24.org>
Subject: [PATCH] vm.c (vm_make_env_each): avoid redundant zero-ing
Date: Mon, 8 Sep 2014 18:49:56 +0000 [thread overview]
Message-ID: <1410202196-612-1-git-send-email-e@80x24.org> (raw)
---
vm.c | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/vm.c b/vm.c
index 7738220..cede9e8 100644
--- a/vm.c
+++ b/vm.c
@@ -404,18 +404,6 @@ static const rb_data_type_t env_data_type = {
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
};
-static VALUE
-env_alloc(int local_size)
-{
- rb_env_t *env;
-
- env = xcalloc(1, sizeof(rb_env_t) + ((local_size + 1) * sizeof(VALUE)));
- env->env_size = local_size + 1 + 1;
- env->local_size = local_size;
-
- return TypedData_Wrap_Struct(rb_cEnv, &env_data_type, env);
-}
-
static VALUE check_env_value(VALUE envval);
static int
@@ -488,10 +476,9 @@ vm_make_env_each(const rb_thread_t *const th, rb_control_frame_t *const cfp,
}
/* allocate env */
- envval = env_alloc(local_size);
- GetEnvPtr(envval, env);
-
- env->prev_envval = penvval;
+ env = xmalloc(sizeof(rb_env_t) + ((local_size + 1) * sizeof(VALUE)));
+ env->env_size = local_size + 1 + 1;
+ env->local_size = local_size;
for (i = 0; i <= local_size; i++) {
env->env[i] = envptr[-local_size + i];
@@ -504,6 +491,15 @@ vm_make_env_each(const rb_thread_t *const th, rb_control_frame_t *const cfp,
#endif
}
+ /* be careful not to trigger GC after this */
+ envval = TypedData_Wrap_Struct(rb_cEnv, &env_data_type, env);
+
+ /*
+ * must happen after TypedData_Wrap_Struct to ensure penvval is markable
+ * in case object allocation above triggers GC and clobbers penvval.
+ */
+ env->prev_envval = penvval;
+
*envptr = envval; /* GC mark */
nenvptr = &env->env[i - 1];
nenvptr[1] = envval; /* frame self */
@@ -513,8 +509,10 @@ vm_make_env_each(const rb_thread_t *const th, rb_control_frame_t *const cfp,
/* as Binding */
env->block.self = cfp->self;
+ env->block.klass = 0;
env->block.ep = cfp->ep;
env->block.iseq = cfp->iseq;
+ env->block.proc = 0;
if (!RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) {
/* TODO */
--
EW
reply other threads:[~2014-09-08 18:50 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1410202196-612-1-git-send-email-e@80x24.org \
--to=e@80x24.org \
--cc=misc@80x24.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).