archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 21:49:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r30894 from trunk into ruby_1_9_2.

Browse source 
--
 * compile.c (get_exception_sym2type): guard temporary object from GC.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31517 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-05-11 21:23:50 +00:00
parent ad558ae184
commit e37dc263e5
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Fri Feb 18 00:28:39 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
* compile.c (get_exception_sym2type): guard temporary object from GC.
Tue May 3 18:23:57 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp> Tue May 3 18:23:57 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* test/date/test_date.rb (TestDate#test_coerce): * test/date/test_date.rb (TestDate#test_coerce):

4
compile.c
View file

@ -5152,6 +5152,7 @@ get_exception_sym2type(VALUE sym)
{ {
#undef rb_intern #undef rb_intern
#define rb_intern(str) rb_intern_const(str) #define rb_intern(str) rb_intern_const(str)
VALUE sym_inspect;
static VALUE symRescue, symEnsure, symRetry; static VALUE symRescue, symEnsure, symRetry;
static VALUE symBreak, symRedo, symNext; static VALUE symBreak, symRedo, symNext;
@ -5170,8 +5171,9 @@ get_exception_sym2type(VALUE sym)
if (sym == symBreak) return CATCH_TYPE_BREAK; if (sym == symBreak) return CATCH_TYPE_BREAK;
if (sym == symRedo) return CATCH_TYPE_REDO; if (sym == symRedo) return CATCH_TYPE_REDO;
if (sym == symNext) return CATCH_TYPE_NEXT; if (sym == symNext) return CATCH_TYPE_NEXT;
sym_inspect = rb_inspect(sym);
rb_raise(rb_eSyntaxError, "invalid exception symbol: %s", rb_raise(rb_eSyntaxError, "invalid exception symbol: %s",
RSTRING_PTR(rb_inspect(sym))); RSTRING_PTR(RB_GC_GUARD(sym_inspect)));
return 0; return 0;
} }

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 201 #define RUBY_PATCHLEVEL 202
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1