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 r30922 and r30924 from trunk into ruby_1_9_2.

Browse source 
--
* prevent temporary objects from GC, and should not use
  RSTRING_PTR() for function calls since it evaluates the argument
  a couple of times.
--
* thread.c (exec_recursive): prevent temporary objects from GC.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31765 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-05-28 23:18:15 +00:00
parent f0a2b08d02
commit 1c0add85ca
9 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Sun Feb 20 16:26:45 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread.c (exec_recursive): prevent temporary objects from GC.
* prevent temporary objects from GC, and should not use
RSTRING_PTR() for function calls since it evaluates the argument
a couple of times.
Sun Feb 20 02:14:09 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> Sun Feb 20 02:14:09 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* signal.c (sig_trap): avoid pthread_sigmask(xx, &mask, &mask) usage * signal.c (sig_trap): avoid pthread_sigmask(xx, &mask, &mask) usage

2
compile.c
View file

@ -5173,7 +5173,7 @@ get_exception_sym2type(VALUE sym)
if (sym == symNext) return CATCH_TYPE_NEXT; if (sym == symNext) return CATCH_TYPE_NEXT;
sym_inspect = rb_inspect(sym); sym_inspect = rb_inspect(sym);
rb_raise(rb_eSyntaxError, "invalid exception symbol: %s", rb_raise(rb_eSyntaxError, "invalid exception symbol: %s",
RSTRING_PTR(RB_GC_GUARD(sym_inspect))); StringValuePtr(sym_inspect));
return 0; return 0;
} }

3
error.c
View file

@ -336,7 +336,8 @@ rb_check_type(VALUE x, int t)
etype = "Symbol"; etype = "Symbol";
} }
else if (rb_special_const_p(x)) { else if (rb_special_const_p(x)) {
etype = RSTRING_PTR(rb_obj_as_string(x)); x = rb_obj_as_string(x);
etype = StringValuePtr(x);
} }
else { else {
etype = rb_obj_classname(x); etype = rb_obj_classname(x);

11
thread.c
View file

@ -3637,10 +3637,14 @@ exec_recursive_i(VALUE tag, struct exec_recursive_params *p)
static VALUE static VALUE
exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE pairid, VALUE arg, int outer) exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE pairid, VALUE arg, int outer)
{ {
VALUE result = Qundef;
struct exec_recursive_params p; struct exec_recursive_params p;
int outermost; int outermost;
p.list = recursive_list_access(); p.list = recursive_list_access();
p.objid = rb_obj_id(obj); p.objid = rb_obj_id(obj);
p.obj = obj;
p.pairid = pairid;
p.arg = arg;
outermost = outer && !recursive_check(p.list, ID2SYM(recursive_key), 0); outermost = outer && !recursive_check(p.list, ID2SYM(recursive_key), 0);
if (recursive_check(p.list, p.objid, pairid)) { if (recursive_check(p.list, p.objid, pairid)) {
@ -3650,11 +3654,7 @@ exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE pairid, VALUE
return (*func)(obj, arg, TRUE); return (*func)(obj, arg, TRUE);
} }
else { else {
VALUE result = Qundef;
p.func = func; p.func = func;
p.obj = obj;
p.pairid = pairid;
p.arg = arg;
if (outermost) { if (outermost) {
recursive_push(p.list, ID2SYM(recursive_key), 0); recursive_push(p.list, ID2SYM(recursive_key), 0);
@ -3667,8 +3667,9 @@ exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE pairid, VALUE
else { else {
result = exec_recursive_i(0, &p); result = exec_recursive_i(0, &p);
} }
return result;
} }
*(volatile struct exec_recursive_params *)&p;
return result;
} }
/* /*

3
variable.c
View file

@ -310,7 +310,8 @@ rb_class_name(VALUE klass)
const char * const char *
rb_class2name(VALUE klass) rb_class2name(VALUE klass)
{ {
return RSTRING_PTR(rb_class_name(klass)); VALUE name = rb_class_name(klass);
return RSTRING_PTR(name);
} }
const char * const char *

6
version.h
View file

@ -1,13 +1,13 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 204 #define RUBY_PATCHLEVEL 205
#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
#define RUBY_RELEASE_YEAR 2011 #define RUBY_RELEASE_YEAR 2011
#define RUBY_RELEASE_MONTH 5 #define RUBY_RELEASE_MONTH 5
#define RUBY_RELEASE_DAY 12 #define RUBY_RELEASE_DAY 28
#define RUBY_RELEASE_DATE "2011-05-12" #define RUBY_RELEASE_DATE "2011-05-28"
#include "ruby/version.h" #include "ruby/version.h"

2
vm.c
View file

@ -1443,7 +1443,7 @@ rb_thread_current_status(const rb_thread_t *th)
} }
else if (cfp->me->def->original_id) { else if (cfp->me->def->original_id) {
str = rb_sprintf("`%s#%s' (cfunc)", str = rb_sprintf("`%s#%s' (cfunc)",
RSTRING_PTR(rb_class_name(cfp->me->klass)), rb_class2name(cfp->me->klass),
rb_id2name(cfp->me->def->original_id)); rb_id2name(cfp->me->def->original_id));
} }

3
vm_eval.c
View file

@ -1014,7 +1014,8 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char
th->base_block = 0; th->base_block = 0;
if (0) { /* for debug */ if (0) { /* for debug */
printf("%s\n", RSTRING_PTR(rb_iseq_disasm(iseqval))); VALUE disasm = rb_iseq_disasm(iseqval);
printf("%s\n", StringValuePtr(disasm));
} }
/* save new env */ /* save new env */

2
vm_insnhelper.c
View file

@ -1142,7 +1142,7 @@ vm_check_if_namespace(VALUE klass)
default: default:
str = rb_inspect(klass); str = rb_inspect(klass);
rb_raise(rb_eTypeError, "%s is not a class/module", rb_raise(rb_eTypeError, "%s is not a class/module",
RSTRING_PTR(RB_GC_GUARD(str))); StringValuePtr(str));
} }
} }