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_6@17678 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 9228a5390f..6513a8fda9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jun 29 17:34:11 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* 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:23:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rdoc/parsers/parse_rb.rb (RDoc#collect_first_comment): skip
diff --git a/eval.c b/eval.c
index 30fe420a73..7fc15bca3f 100644
--- a/eval.c
+++ b/eval.c
@@ -761,7 +761,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;	\
@@ -1058,7 +1058,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 ccc2b276b5..3a1654af8c 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-29"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080629
-#define RUBY_PATCHLEVEL 245
+#define RUBY_PATCHLEVEL 246
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8