8000 merge revision(s) 36251: · ruby/ruby@e48d99f · GitHub
[go: up one dir, main page]
Skip to content

Commit e48d99f

Browse files
shyouheishyouhei
committed
merge revision(s) 36251:
 * eval.c (stack_extend): prevent ALLOCA_N, which reserves a memory space with for restoring machine stack stored in each threads, from optimization out. backport r34278 from the trunk. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@36253 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent d761c9b commit e48d99f

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

‎ChangeLog

+6Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Fri Jun 29 21:26:05 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
2+
3+
* eval.c (stack_extend): prevent ALLOCA_N, which reserves a memory
4+
space with for restoring machine stack stored in each threads, from
5+
optimization out. backport r34278 from the trunk.
6+
17
Mon Jun 18 18:32:43 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
28

39
* backport r32609 from trunk.

‎eval.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10824,6 +10824,7 @@ stack_extend(rb_thread_t th, int exit)
1082410824
if (space > th->stk_pos) {
1082510825
# ifdef HAVE_ALLOCA
1082610826
sp = ALLOCA_N(VALUE, &space[0] - th->stk_pos);
10827+
space[0] = *sp;
1082710828
# else
1082810829
stack_extend(th, exit);
1082910830
# endif
@@ -10838,6 +10839,7 @@ stack_extend(rb_thread_t th, int exit)
1083810839
if (&space[STACK_PAD_SIZE] < th->stk_pos + th->stk_len) {
1083910840
# ifdef HAVE_ALLOCA
1084010841
sp = ALLOCA_N(VALUE, th->stk_pos + th->stk_len - &space[STACK_PAD_SIZE]);
10842+
space[0] = *sp;
1084110843
# else
1084210844
stack_extend(th, exit);
1084310845
# endif

‎version.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#define RUBY_VERSION "1.8.7"
2-
#define RUBY_RELEASE_DATE "2012-06-18"
2+
#define RUBY_RELEASE_DATE "2012-06-29"
33
#define RUBY_VERSION_CODE 187
4-
#define RUBY_RELEASE_CODE 20120618
5-
#define RUBY_PATCHLEVEL 369
4+
#define RUBY_RELEASE_CODE 20120629
5+
#define RUBY_PATCHLEVEL 370
66

77
#define RUBY_VERSION_MAJOR 1
88
#define RUBY_VERSION_MINOR 8
99
#define RUBY_VERSION_TEENY 7
1010
#define RUBY_RELEASE_YEAR 2012
1111
#define RUBY_RELEASE_MONTH 6
12-
#define RUBY_RELEASE_DAY 18
12+
#define RUBY_RELEASE_DAY 29
1313

1414
#ifdef RUBY_EXTERN
1515
RUBY_EXTERN const char ruby_version[];

0 commit comments

Comments
 (0)
0