aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-19 03:35:39 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-19 03:35:39 +0000
commit98e7aa679a65fc0ec8e476c52b7254d4d6d2350d (patch)
tree95666574a60a26847fa2d062d42ea9d67d491c0b
parent9e5d0d861f1f082c0c8632e62aa018972cc533bb (diff)
downloadruby-98e7aa679a65fc0ec8e476c52b7254d4d6d2350d.tar.gz
* insnhelper.ci (vm_callee_setup_arg): fix to mark enough VM stack.
[ruby-dev:31492] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--insnhelper.ci5
-rw-r--r--version.h6
3 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 3bd9ddd5bb..b1b0872edd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug 19 12:32:39 2007 Koichi Sasada <ko1@atdot.net>
+
+ * insnhelper.ci (vm_callee_setup_arg): fix to mark enough VM stack.
+ [ruby-dev:31492]
+
Sat Aug 18 19:02:34 2007 Tanaka Akira <akr@fsij.org>
* test/ruby/test_yield.rb (TestYieldGen): relax array size check
diff --git a/insnhelper.ci b/insnhelper.ci
index b65190812a..e1b6d79ae4 100644
--- a/insnhelper.ci
+++ b/insnhelper.ci
@@ -114,6 +114,7 @@ vm_callee_setup_arg(rb_thread_t *th, rb_iseq_t *iseq,
else {
VALUE * const dst = argv;
int opt_pc = 0;
+ th->mark_stack_len = iseq->arg_size;
/* mandatory */
if (argc < (m + iseq->arg_post_len)) { /* check with post arg */
@@ -176,9 +177,7 @@ vm_callee_setup_arg(rb_thread_t *th, rb_iseq_t *iseq,
if (blockptr->proc == 0) {
rb_proc_t *proc;
- th->mark_stack_len = orig_argc; /* for GC */
blockval = vm_make_proc(th, th->cfp, blockptr);
- th->mark_stack_len = 0;
GetProcPtr(blockval, proc);
*block = &proc->block;
@@ -190,7 +189,7 @@ vm_callee_setup_arg(rb_thread_t *th, rb_iseq_t *iseq,
dst[iseq->arg_block] = blockval; /* Proc or nil */
}
-
+ th->mark_stack_len = 0;
return opt_pc;
}
}
diff --git a/version.h b/version.h
index a940e26218..4393d5083c 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-08-18"
+#define RUBY_RELEASE_DATE "2007-08-19"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20070818
+#define RUBY_RELEASE_CODE 20070819
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 19
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];