naruse	2017-03-13 02:51:21 +0900 (Mon, 13 Mar 2017)

  New Revision: 57938

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

  Log:
    merge revision(s) 57427: [Backport #13030]
    
    skip T_IMEMO for VMDEBUG
    
    * vm_dump.c (vm_stack_dump_each): skip T_IMEMO object to display
      for VMDEBUG=3. [Bug #13030]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/version.h
    branches/ruby_2_4/vm_dump.c
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57937)
+++ ruby_2_4/version.h	(revision 57938)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-13"
-#define RUBY_PATCHLEVEL 92
+#define RUBY_PATCHLEVEL 93
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_4/vm_dump.c
===================================================================
--- ruby_2_4/vm_dump.c	(revision 57937)
+++ ruby_2_4/vm_dump.c	(revision 57938)
@@ -282,11 +282,16 @@ vm_stack_dump_each(rb_thread_t *th, rb_c https://github.com/ruby/ruby/blob/trunk/ruby_2_4/vm_dump.c#L282
 
 	ptr = vm_base_ptr(cfp);
 	for (; ptr < sp; ptr++, i++) {
-	    if (*ptr == Qundef) {
+	    switch (TYPE(*ptr)) {
+	      case T_UNDEF:
 		rstr = rb_str_new2("undef");
-	    }
-	    else {
+		break;
+	      case T_IMEMO:
+		rstr = rb_str_new2("imemo"); /* TODO: can put mode detail information */
+		break;
+	      default:
 		rstr = rb_inspect(*ptr);
+		break;
 	    }
 	    fprintf(stderr, "  stack %2d: %8s (%"PRIdPTRDIFF")\n", i, StringValueCStr(rstr),
 		    (ptr - th->stack));

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57427


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