merge revision(s) 61535:

iseq.c: fix build error when VM_CHECK_MODE is enabled Follow up of r61534. Sorry. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@66297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
ruby · Dec 9, 2018 · 352e8e9 · 352e8e9
1 parent 2eadd92
commit 352e8e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/iseq.c b/iseq.c
@@ -1312,7 +1312,7 @@ static const struct iseq_insn_info_entry *
 get_insn_info_linear_search(const rb_iseq_t *iseq, size_t pos)
 {
     size_t i = 0, size = iseq->body->insns_info_size;
-    const struct iseq_insn_info_entry *insns_info = iseq->body->insns_info;
+    const struct iseq_insn_info_entry *insns_info = iseq->body->insns_info.body;
     const int debug = 0;
 
     if (debug) {

diff --git a/version.h b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.5.4"
-#define RUBY_RELEASE_DATE "2018-12-08"
-#define RUBY_PATCHLEVEL 120
+#define RUBY_RELEASE_DATE "2018-12-09"
+#define RUBY_PATCHLEVEL 121
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 8
+#define RUBY_RELEASE_DAY 9
 
 #include "ruby/version.h"