Permalink
Browse files

vm_core.h: flip_cnt in rb_iseq_t

* vm_core.h (rb_iseq_t): move flip_cnt from struct iseq_compile_data,
  because it has same life span as enclosing iseq.  [Bug #7671]
  [ruby-core:51296]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38739 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent bdb18e5 commit 69b716111f04a5a692578638a16fc55a75a9dd1d @nobu nobu committed Jan 8, 2013
Showing with 17 additions and 4 deletions.
  1. +6 −0 ChangeLog
  2. +2 −3 compile.c
  3. +0 −1 iseq.h
  4. +8 −0 test/ruby/test_flip.rb
  5. +1 −0 vm_core.h
View
@@ -1,3 +1,9 @@
+Tue Jan 8 14:41:41 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_core.h (rb_iseq_t): move flip_cnt from struct iseq_compile_data,
+ because it has same life span as enclosing iseq. [Bug #7671]
+ [ruby-core:51296]
+
Mon Jan 7 23:43:00 2013 Kenta Murata <mrkn@mrkn.jp>
* ext/bigdecimal/bigdecimal.c (rmpd_power_by_big_decimal):
View
@@ -5051,12 +5051,11 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
LABEL *lend = NEW_LABEL(nd_line(node));
LABEL *lfin = NEW_LABEL(nd_line(node));
LABEL *ltrue = NEW_LABEL(nd_line(node));
- struct iseq_compile_data *data = iseq->local_iseq->compile_data;
+ rb_iseq_t *local_iseq = iseq->local_iseq;
rb_num_t cnt;
VALUE key;
- if (!data) data = iseq->compile_data;
- cnt = data->flip_cnt++ + DEFAULT_SPECIAL_VAR_COUNT;
+ cnt = local_iseq->flip_cnt++ + DEFAULT_SPECIAL_VAR_COUNT;
key = INT2FIX(cnt);
ADD_INSN2(ret, nd_line(node), getspecial, key, INT2FIX(0));
View
1 iseq.h
@@ -98,7 +98,6 @@ struct iseq_compile_data {
struct iseq_compile_data_storage *storage_current;
int last_line;
int last_coverable_line;
- int flip_cnt;
int label_no;
int node_level;
const rb_compile_option_t *option;
View
@@ -10,4 +10,12 @@ def test_hidden_key
2000.times {eval %[(foo..bar) ? 1 : 2]}
end
end
+
+ def test_shared_eval
+ bug7671 = '[ruby-core:51296]'
+ vs = (1..9).to_a
+ vs.select {|n| if n==2..n==16 then 1 end}
+ v = eval("vs.select {|n| if n==3..n==6 then 1 end}")
+ assert_equal([*3..6], v, bug7671)
+ end
end
View
@@ -306,6 +306,7 @@ struct rb_iseq_struct {
/* misc */
ID defined_method_id; /* for define_method */
+ rb_num_t flip_cnt;
/* used at compile time */
struct iseq_compile_data *compile_data;

0 comments on commit 69b7161

Please sign in to comment.