nagachika	2018-12-09 14:38:38 +0900 (Sun, 09 Dec 2018)

  New Revision: 66297

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66297

  Log:
    merge revision(s) 61535:
    
    iseq.c: fix build error when VM_CHECK_MODE is enabled
    
    Follow up of r61534.  Sorry.

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/iseq.c
    branches/ruby_2_5/version.h
Index: ruby_2_5/iseq.c
===================================================================
--- ruby_2_5/iseq.c	(revision 66296)
+++ ruby_2_5/iseq.c	(revision 66297)
@@ -1312,7 +1312,7 @@ static const struct iseq_insn_info_entry https://github.com/ruby/ruby/blob/trunk/ruby_2_5/iseq.c#L1312
 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) {
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 66296)
+++ ruby_2_5/version.h	(revision 66297)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #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"
 
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 66296)
+++ ruby_2_5	(revision 66297)

Property changes on: ruby_2_5
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r61535

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/