nobu	2008-06-27 11:02:41 +0900 (Fri, 27 Jun 2008)

  New Revision: 17594

  Modified files:
    branches/mvm/ChangeLog
    branches/mvm/configure.in
    branches/mvm/process.c
    branches/mvm/vm_eval.c

  Log:
    * merge from trunk r17591:17593

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/ChangeLog?r1=17594&r2=17593&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/configure.in?r1=17594&r2=17593&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/vm_eval.c?r1=17594&r2=17593&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/process.c?r1=17594&r2=17593&diff_format=u

Index: mvm/configure.in
===================================================================
--- mvm/configure.in	(revision 17593)
+++ mvm/configure.in	(revision 17594)
@@ -1165,7 +1165,7 @@
     }
 
     return EXIT_SUCCESS;
-}]
+}],
 	rb_cv_fork_with_pthread=yes,
 	rb_cv_fork_with_pthread=no,
 	rb_cv_fork_with_pthread=yes)])
Index: mvm/ChangeLog
===================================================================
--- mvm/ChangeLog	(revision 17593)
+++ mvm/ChangeLog	(revision 17594)
@@ -1,3 +1,14 @@
+Fri Jun 27 06:52:54 2008  Koichi Sasada  <ko1@a...>
+
+	* configure.in: need a ",".
+
+	* process.c (rb_fork): check CANNOT_FORK_WITH_PTHREAD macro.
+
+Fri Jun 27 06:50:56 2008  Koichi Sasada  <ko1@a...>
+
+	* vm_eval.c (vm_call_super): fix to call method_missing.
+	  [ruby-core:15719], [ruby-core:17340]
+
 Fri Jun 27 00:44:39 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (argf_binmode_p): fix for backport.
Index: mvm/vm_eval.c
===================================================================
--- mvm/vm_eval.c	(revision 17593)
+++ mvm/vm_eval.c	(revision 17594)
@@ -148,10 +148,12 @@
 	body = body->nd_body;
     }
     else {
-	dp(recv);
-	dp(klass);
-	dpi(id);
-	rb_bug("vm_call_super: not found");
+	VALUE *argv_m = ALLOCA_N(VALUE, argc+1);
+	MEMCPY(argv_m + 1, argv, VALUE, argc);
+	argv_m[0] = ID2SYM(id);
+	th->method_missing_reason = 0;
+	th->passed_block = 0;
+	return rb_funcall2(recv, idMethodMissing, argc + 1, argv);
     }
 
     return vm_call0(th, klass, recv, id, id, argc, argv, body, CALL_SUPER);
Index: mvm/process.c
===================================================================
--- mvm/process.c	(revision 17593)
+++ mvm/process.c	(revision 17594)
@@ -2412,7 +2412,7 @@
 static VALUE
 rb_f_fork(VALUE obj)
 {
-#if defined(HAVE_FORK) && !(defined(__NetBSD__) && __NetBSD_Version__ < 400000000)
+#if defined(HAVE_FORK) && !defined(CANNOT_FORK_WITH_PTHREAD)
     rb_pid_t pid;
 
     rb_secure(2);

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