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_insnhelper.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_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 9f2d050ec7..6b78394ca2 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1142,7 +1142,7 @@ vm_check_if_namespace(VALUE klass) default: str = rb_inspect(klass); rb_raise(rb_eTypeError, "%s is not a class/module", - RSTRING_PTR(RB_GC_GUARD(str))); + StringValuePtr(str)); } } |