updated for version 7.3.933

Problem:    Ruby on Mac crashes due to GC failure.
Solution:   Init the stack from main(). (Hiroshi Shirosaki)

diff --git a/src/if_ruby.c b/src/if_ruby.c
index d79d0eeb7ba78e648b394b7f96c9883e4f5223de..f1752f04711255cf433f81a11e3fdc6d45c1393f 100644 (file)
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -144,6 +144,7 @@
 #endif
 
 static int ruby_initialized = 0;
+static void *ruby_stack_start;
 static VALUE objtbl;
 
 static VALUE mVIM;
@@ -226,6 +227,7 @@ static void ruby_vim_init(void);
 # define rb_float_new                  dll_rb_float_new
 # define rb_ary_new                    dll_rb_ary_new
 # define rb_ary_push                   dll_rb_ary_push
+# define ruby_init_stack               dll_ruby_init_stack
 #else
 # define rb_str2cstr                   dll_rb_str2cstr
 #endif
@@ -250,7 +252,6 @@ static void ruby_vim_init(void);
 # define rb_enc_str_new                        dll_rb_enc_str_new
 # define rb_sprintf                    dll_rb_sprintf
 # define rb_require                    dll_rb_require
-# define ruby_init_stack               dll_ruby_init_stack
 # define ruby_process_options          dll_ruby_process_options
 #endif
 
@@ -335,6 +336,7 @@ static char * (*dll_rb_string_value_ptr) (volatile VALUE*);
 static VALUE (*dll_rb_float_new) (double);
 static VALUE (*dll_rb_ary_new) (void);
 static VALUE (*dll_rb_ary_push) (VALUE, VALUE);
+static void (*ruby_init_stack)(VALUE*);
 #endif
 #ifdef RUBY19_OR_LATER
 static VALUE (*dll_rb_int2big)(SIGNED_VALUE);
@@ -347,7 +349,6 @@ static rb_encoding* (*dll_rb_enc_find) (const char*);
 static VALUE (*dll_rb_enc_str_new) (const char*, long, rb_encoding*);
 static VALUE (*dll_rb_sprintf) (const char*, ...);
 static VALUE (*dll_rb_require) (const char*);
-static void (*ruby_init_stack)(VALUE*);
 static void* (*ruby_process_options)(int, char**);
 #endif
 
@@ -475,6 +476,7 @@ static struct
 #endif
 #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
     {"rb_string_value_ptr", (RUBY_PROC*)&dll_rb_string_value_ptr},
+    {"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
 # if DYNAMIC_RUBY_VER <= 19
     {"rb_float_new", (RUBY_PROC*)&dll_rb_float_new},
 # else
@@ -491,7 +493,6 @@ static struct
     {"rb_enc_str_new", (RUBY_PROC*)&dll_rb_enc_str_new},
     {"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf},
     {"rb_require", (RUBY_PROC*)&dll_rb_require},
-    {"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
     {"ruby_process_options", (RUBY_PROC*)&dll_ruby_process_options},
 #endif
     {"", NULL},
@@ -716,8 +717,8 @@ static int ensure_ruby_initialized(void)
            NtInitialize(&argc, &argv);
 #endif
            {
-#ifdef RUBY19_OR_LATER
-               RUBY_INIT_STACK;
+#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
+               ruby_init_stack(ruby_stack_start);
 #endif
                ruby_init();
            }
@@ -1389,3 +1390,9 @@ static void ruby_vim_init(void)
     rb_define_virtual_variable("$curbuf", buffer_s_current, 0);
     rb_define_virtual_variable("$curwin", window_s_current, 0);
 }
+
+void vim_ruby_init(void *stack_start)
+{
+    /* should get machine stack start address early in main function */
+    ruby_stack_start = stack_start;
+}

diff --git a/src/main.c b/src/main.c
index cba8dce75da05e63b06848624e36cac0279d2955..b524c7edaac0e3964096282ed2f74e813d336aa0 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -192,6 +192,13 @@ main
     params.window_count = -1;
 #endif
 
+#ifdef FEAT_RUBY
+    {
+       int ruby_stack_start;
+       vim_ruby_init((void *)&ruby_stack_start);
+    }
+#endif
+
 #ifdef FEAT_TCL
     vim_tcl_init(params.argv[0]);
 #endif

diff --git a/src/proto/if_ruby.pro b/src/proto/if_ruby.pro
index 7dedb225cb355e75add5130b31a4d97731bcfa3c..3e03b1f09170c800363136fd539f366a2ad5140c 100644 (file)
--- a/src/proto/if_ruby.pro
+++ b/src/proto/if_ruby.pro
@@ -6,4 +6,5 @@ void ex_rubydo __ARGS((exarg_T *eap));
 void ex_rubyfile __ARGS((exarg_T *eap));
 void ruby_buffer_free __ARGS((buf_T *buf));
 void ruby_window_free __ARGS((win_T *win));
+void vim_ruby_init __ARGS((void *stack_start));
 /* vim: set ft=c : */

diff --git a/src/version.c b/src/version.c
index 7c2eb6fe80aca0de9419a2dffd690e93b7a6b60c..3cf57bba613380ddb25a606f91081201b0cb207c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    933,
 /**/
     932,
 /**/