aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-04 04:42:31 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-04 04:42:31 +0000
commit8e1d6b214a696333290df5d54dcc9a472d4b2df6 (patch)
tree7c1955558a3c4b517bd8af1490b958dd82d1e04a
parentfd847f79a0c5e9e61860ff4133665f7099bc85cf (diff)
downloadruby-8e1d6b214a696333290df5d54dcc9a472d4b2df6.tar.gz
* gc.c (add_heap): fix previous change. [ruby-dev:33988]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--gc.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 67d2acf336..8d6ee0cc91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Mar 4 13:41:46 2008 Tanaka Akira <akr@fsij.org>
+
+ * gc.c (add_heap): fix previous change. [ruby-dev:33988]
+
Tue Mar 4 10:21:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* gc.c (add_heap): use binary search to find the place to insert the
diff --git a/gc.c b/gc.c
index a1106abcc4..928c312bea 100644
--- a/gc.c
+++ b/gc.c
@@ -466,14 +466,15 @@ add_heap(void)
}
}
+ membase = p;
if ((VALUE)p % sizeof(RVALUE) == 0)
heap_slots += 1;
else
p = (RVALUE*)((VALUE)p + sizeof(RVALUE) - ((VALUE)p % sizeof(RVALUE)));
if (hi < heaps_used) {
- MEMMOVE(&heaps[hi+1], &heaps[hi], VALUE, heaps_used - hi);
+ MEMMOVE(&heaps[hi+1], &heaps[hi], struct heaps_slot, heaps_used - hi);
}
- heaps[hi].membase = p;
+ heaps[hi].membase = membase;
heaps[hi].slot = p;
heaps[hi].limit = heap_slots;
pend = p + heap_slots;