summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-26 06:48:21 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-26 06:48:21 +0000
commitf0071d3b311ab5af39a83481ce2363cbe4aab1b2 (patch)
tree7929b36408970ee168939b299228453d3caa2797
parentef8c2e4be52314f90cad38c8010dff1e07437e21 (diff)
* compile.c (iseq_set_sequence): use "nop" insn instead of
"jump to next insn". https://bugs.ruby-lang.org/issues/8543#change-50085 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48579 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--compile.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index eaa20be4c3..e02dadcfc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Nov 26 15:32:06 2014 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c (iseq_set_sequence): use "nop" insn instead of
+ "jump to next insn".
+ https://bugs.ruby-lang.org/issues/8543#change-50085
+
Wed Nov 26 11:01:35 2014 Eric Wong <e@80x24.org>
* iseq.c (iseq_s_compile_file): close IO when done
diff --git a/compile.c b/compile.c
index 7a73ddfcd9..5f68113357 100644
--- a/compile.c
+++ b/compile.c
@@ -1642,8 +1642,8 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
line_info_table[k].position = pos;
k++;
}
- generated_iseq[pos++] = BIN(jump);
- generated_iseq[pos++] = 0;
+ generated_iseq[pos++] = BIN(nop);
+ generated_iseq[pos++] = BIN(nop);
}
else {
rb_bug("iseq_set_sequence: adjust bug");