[前][次][番号順一覧][スレッド一覧]

ruby-changes:26314

From: shugo <ko1@a...>
Date: Thu, 13 Dec 2012 23:18:32 +0900 (JST)
Subject: [ruby-changes:26314] shugo:r38365 (trunk): * vm_insnhelper.c (vm_call_super_method): a workaround for the

shugo	2012-12-13 23:18:20 +0900 (Thu, 13 Dec 2012)

  New Revision: 38365

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38365

  Log:
    * vm_insnhelper.c (vm_call_super_method): a workaround for the
      failure of TestRefinement#test_refine_recursion in Windows.
      See [ruby-core:50871] for details.

  Modified files:
    trunk/ChangeLog
    trunk/vm_insnhelper.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38364)
+++ ChangeLog	(revision 38365)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Dec 13 23:14:17 2012  Shugo Maeda  <shugo@r...>
+
+	* vm_insnhelper.c (vm_call_super_method): a workaround for the
+	  failure of TestRefinement#test_refine_recursion in Windows.
+	  See [ruby-core:50871] for details.
+
 Thu Dec 13 23:10:52  Charlie Somerville  <charlie@c...>
 	* object.c (Init_Object): use rb_mod_init_copy for Class#initialize_copy
 	* class.c (rb_class_init_copy): rename to class_init_copy_check, performs type
Index: vm_insnhelper.c
===================================================================
--- vm_insnhelper.c	(revision 38364)
+++ vm_insnhelper.c	(revision 38365)
@@ -1852,6 +1852,11 @@ vm_call_general(rb_thread_t *th, rb_cont https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.c#L1852
 static VALUE
 vm_call_super_method(rb_thread_t *th, rb_control_frame_t *reg_cfp, rb_call_info_t *ci)
 {
+#ifdef _WIN32
+    volatile int x = 0; /* a workaround to avoid VC++ optimization which
+			   makes vm_call_super_method as an alias of
+			   vm_call_general! */
+#endif
     return vm_call_method(th, reg_cfp, ci);
 }
 

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

[前][次][番号順一覧][スレッド一覧]