kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

compile.c: use correct key for block when loading serialized iseqs

Browse source 
* compile.c (iseq_build_from_ary_body): Use :blockptr instead of :block
  as hash key when loading serialized instruction sequences from arrays.
  [Bug #9455] [ruby-core:60146]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
charliesome 2014-01-27 23:56:22 +00:00
parent 418608fee8
commit a22dd11af8
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Jan 28 08:56:00 2014 Charlie Somerville <charliesome@ruby-lang.org>
* compile.c (iseq_build_from_ary_body): Use :blockptr instead of :block
as hash key when loading serialized instruction sequences from arrays.
[Bug #9455] [ruby-core:60146]
Mon Jan 27 21:52:55 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread_pthread.c: get current main thread stack size, which may

2
compile.c
View file

@ -5808,7 +5808,7 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
VALUE vmid = rb_hash_aref(op, ID2SYM(rb_intern("mid")));
VALUE vflag = rb_hash_aref(op, ID2SYM(rb_intern("flag")));
VALUE vorig_argc = rb_hash_aref(op, ID2SYM(rb_intern("orig_argc")));
VALUE vblock = rb_hash_aref(op, ID2SYM(rb_intern("block")));
VALUE vblock = rb_hash_aref(op, ID2SYM(rb_intern("blockptr")));
if (!NIL_P(vmid)) mid = SYM2ID(vmid);
if (!NIL_P(vflag)) flag = NUM2ULONG(vflag);