summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-03-04 06:28:51 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-03-04 06:28:51 +0000
commitdbb31b249bc4f3a43fd527b74f78d9743174c0e9 (patch)
treef6a946c95ae3a014230805b64f95d3b4911b8083
parent64687870665c6119562c7950295527438e5ca1de (diff)
downloadruby-dbb31b249bc4f3a43fd527b74f78d9743174c0e9.tar.gz
ruby-dbb31b249bc4f3a43fd527b74f78d9743174c0e9.tar.xz
ruby-dbb31b249bc4f3a43fd527b74f78d9743174c0e9.zip
* gc.c (id2ref): fix symbol test.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--gc.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f151d31aa..bc69cd373 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Mar 4 15:26:40 2006 Tanaka Akira <akr@m17n.org>
+
+ * gc.c (id2ref): fix symbol test.
+
Sat Mar 4 01:08:07 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
diff --git a/gc.c b/gc.c
index f9610013f..8a98df851 100644
--- a/gc.c
+++ b/gc.c
@@ -1912,15 +1912,15 @@ id2ref(obj, objid)
if (ptr == Qfalse) return Qfalse;
if (ptr == Qnil) return Qnil;
if (FIXNUM_P(ptr)) return (VALUE)ptr;
+ ptr = objid ^ FIXNUM_FLAG; /* unset FIXNUM_FLAG */
- if ((objid % sizeof(RVALUE)) == (4 << 2)) {
- ID symid = objid / sizeof(RVALUE);
+ if ((ptr % sizeof(RVALUE)) == (4 << 2)) {
+ ID symid = ptr / sizeof(RVALUE);
if (rb_id2name(symid) == 0)
rb_raise(rb_eRangeError, "%p is not symbol id value", p0);
return ID2SYM(symid);
}
- ptr = objid ^ FIXNUM_FLAG; /* unset FIXNUM_FLAG */
if (!is_pointer_to_heap((void *)ptr)|| BUILTIN_TYPE(ptr) >= T_BLKTAG) {
rb_raise(rb_eRangeError, "0x%lx is not id value", p0);
}