Permalink
Browse files

merge revision(s) 38134,38136: [Backport #7468]

	* gc.h (SET_MACHINE_STACK_END): add volatile for preventing
	  harmful optimization.
	  harmful optimization.  [ruby-dev:46665] [Bug #7468]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 4e0632a commit 3f084cde2b5306d2928b6d87676c5477fd30e492 @unak unak committed Dec 20, 2012
Showing with 8 additions and 3 deletions.
  1. +5 −0 ChangeLog
  2. +2 −2 gc.h
  3. +1 −1 version.h
View
@@ -1,3 +1,8 @@
+Thu Dec 20 18:35:36 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * gc.h (SET_MACHINE_STACK_END): add volatile for preventing
+ harmful optimization. [ruby-dev:46665] [Bug #7468]
+
Thu Dec 20 18:34:38 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
* compile.c (ADD_CATCH_ENTRY): add a cast to fix SEGV with x64 mingw
View
4 gc.h
@@ -3,9 +3,9 @@
#define RUBY_GC_H 1
#if defined(__x86_64__) && defined(__GNUC__)
-#define SET_MACHINE_STACK_END(p) __asm__("movq\t%%rsp, %0" : "=r" (*(p)))
+#define SET_MACHINE_STACK_END(p) __asm__ volatile ("movq\t%%rsp, %0" : "=r" (*(p)))
#elif defined(__i386) && defined(__GNUC__)
-#define SET_MACHINE_STACK_END(p) __asm__("movl\t%%esp, %0" : "=r" (*(p)))
+#define SET_MACHINE_STACK_END(p) __asm__ volatile ("movl\t%%esp, %0" : "=r" (*(p)))
#else
NOINLINE(void rb_gc_set_stack_end(VALUE **stack_end_p));
#define SET_MACHINE_STACK_END(p) rb_gc_set_stack_end(p)
View
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 347
+#define RUBY_PATCHLEVEL 348
#define RUBY_RELEASE_DATE "2012-12-20"
#define RUBY_RELEASE_YEAR 2012

0 comments on commit 3f084cd

Please sign in to comment.