naruse	2018-02-18 23:25:43 +0900 (Sun, 18 Feb 2018)

  New Revision: 62472

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

  Log:
    merge revision(s) 61591: [Backport #14312]
    
    iseq.c (rb_iseq_new_with_opt): handle the case where node is imemo_func

  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 62471)
+++ ruby_2_5/iseq.c	(revision 62472)
@@ -517,9 +517,11 @@ rb_iseq_new_with_opt(const NODE *node, V https://github.com/ruby/ruby/blob/trunk/ruby_2_5/iseq.c#L517
 {
     /* TODO: argument check */
     rb_iseq_t *iseq = iseq_alloc();
+    const rb_code_range_t *code_range = NULL;
 
     if (!option) option = &COMPILE_OPTION_DEFAULT;
-    prepare_iseq_build(iseq, name, path, realpath, first_lineno, node ? &node->nd_loc : NULL, parent, type, option);
+    if (node && !imemo_type_p((VALUE)node, imemo_ifunc)) code_range = &node->nd_loc;
+    prepare_iseq_build(iseq, name, path, realpath, first_lineno, code_range, parent, type, option);
 
     rb_iseq_compile_node(iseq, node);
     finish_iseq_build(iseq);
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 62471)
+++ ruby_2_5/version.h	(revision 62472)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.0"
 #define RUBY_RELEASE_DATE "2018-02-18"
-#define RUBY_PATCHLEVEL 20
+#define RUBY_PATCHLEVEL 21
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 2
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 62471)
+++ ruby_2_5	(revision 62472)

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

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