merges r23371 from trunk into ruby_1_9_1.

--
* vm_eval.c (rb_f_catch): gets rid of issue with gcc 4.4.  a patch
  from Alexey Froloff in [ruby-core:23398].  [ruby-core:22924]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 564c45292d..c716935176 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May  9 11:14:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_f_catch): gets rid of issue with gcc 4.4.  a patch
+	  from Alexey Froloff in [ruby-core:23398].  [ruby-core:22924]
+
 Thu May  7 21:42:51 2009  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* test/ruby/test_rubyoptions.rb (test_indentation_check): add a test
diff --git a/version.h b/version.h
index 69c2690146..470d1f4365 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-12"
-#define RUBY_PATCHLEVEL 132
+#define RUBY_PATCHLEVEL 133
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
diff --git a/vm_eval.c b/vm_eval.c
index aaef1c71ae..0ec847882a 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -1232,7 +1232,7 @@ rb_f_catch(int argc, VALUE *argv)
 {
     VALUE tag;
     int state;
-    VALUE val = Qnil;		/* OK */
+    volatile VALUE val = Qnil;		/* OK */
     rb_thread_t *th = GET_THREAD();
     rb_control_frame_t *saved_cfp = th->cfp;