summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-12-09 05:38:38 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-12-09 05:38:38 +0000
commit352e8e9c49f8e8e5cf263d7fb9ff58a671a8c105 (patch)
tree336308014f0acd3d9e9a266f97ba9374e60c709a
parent2eadd924faba28f8ca3f7b8463f962b6c3bb55a5 (diff)
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
-rw-r--r--iseq.c2
-rw-r--r--version.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/iseq.c b/iseq.c
index 7d7398607e..868c4ee4f8 100644
--- 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
index 9b5193b609..4d8f44f02f 100644
--- 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"