diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-28 23:18:15 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-28 23:18:15 +0000 |
commit | 1c0add85ca100eb93a3455aa51a4ffe13bb72e35 (patch) | |
tree | baf5ea99fc61d9bd1bbe556c29e91514c8965c7a /vm.c | |
parent | f0a2b08d02e9e439e8d700f49e6a348b2d3ee9e0 (diff) |
merges r30922 and r30924 from trunk into ruby_1_9_2.
--
* 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
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1443,7 +1443,7 @@ rb_thread_current_status(const rb_thread_t *th) } else if (cfp->me->def->original_id) { 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)); } |