From b53240a526795688a19fd9c80b53f5e790cf2ba7 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 29 Jun 2008 09:20:47 +0000 Subject: merge revision(s) 17547: * eval.c (PUSH_FRAME, PUSH_CLASS): Add volatile to avoid a possible optimization bug on OS X/PPC. This at least makes build with gcc -O1 and `make test' pass. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@17680 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ eval.c | 4 ++-- version.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d8eee5fbd4..0688a8bc20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jun 29 18:19:11 2008 Akinori MUSHA + + * eval.c (PUSH_FRAME, PUSH_CLASS): Add volatile to avoid a + possible optimization bug on OS X/PPC. This at least makes + build with gcc -O1 and `make test' pass. + Sun Jun 29 17:24:43 2008 Nobuyoshi Nakada * lib/rdoc/parsers/parse_rb.rb (RDoc#collect_first_comment): skip diff --git a/eval.c b/eval.c index 9391b5b927..ff163eba6b 100644 --- a/eval.c +++ b/eval.c @@ -758,7 +758,7 @@ static struct SCOPE *top_scope; static unsigned long frame_unique = 0; #define PUSH_FRAME() do { \ - struct FRAME _frame; \ + volatile struct FRAME _frame; \ _frame.prev = ruby_frame; \ _frame.tmp = 0; \ _frame.node = ruby_current_node; \ @@ -1055,7 +1055,7 @@ VALUE ruby_class; static VALUE ruby_wrapper; /* security wrapper */ #define PUSH_CLASS(c) do { \ - VALUE _class = ruby_class; \ + volatile VALUE _class = ruby_class; \ ruby_class = (c) #define POP_CLASS() ruby_class = _class; \ diff --git a/version.h b/version.h index d6ea114592..4f29f70f87 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-29" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20080629 -#define RUBY_PATCHLEVEL 28 +#define RUBY_PATCHLEVEL 29 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3