* gc.c (rb_gc_mark_locations): remove margin. [ruby-dev:20462]

nobu · nobu · commit c9ee75de3226 · 2003-06-28T03:28:53.000Z
* gc.c (Init_stack): add safety margin.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@4011 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jun 28 12:28:46 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* gc.c (rb_gc_mark_locations): remove margin.  [ruby-dev:20462]
+
+	* gc.c (Init_stack): add safety margin.
+
 Fri May 30 11:25:58 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* lib/irb/xmp.rb: sync with 1.8 ("irb/irb" -> "irb").
diff --git a/gc.c b/gc.c
@@ -434,7 +434,7 @@ rb_gc_mark_locations(start, end)
 	start = end;
 	end = tmp;
     }
-    n = end - start + 1;
+    n = end - start;
     mark_locations_array(start,n);
 }
 
@@ -1106,11 +1106,11 @@ Init_stack(addr)
     if (!addr) addr = (VALUE *)&addr;
     if (rb_gc_stack_start) {
 	if (stack_growup_p(addr)) {
-	    if (rb_gc_stack_start > addr)
+	    if (rb_gc_stack_start > --addr)
 		rb_gc_stack_start = addr;
 	}
 	else {
-	    if (rb_gc_stack_start < addr)
+	    if (rb_gc_stack_start < ++addr)
 		rb_gc_stack_start = addr;
 	}
 	return;

Original file line number	Diff line number	Diff line change
`@@ -434,7 +434,7 @@ rb_gc_mark_locations(start, end)`
`434`	`434`	`start = end;`
`435`	`435`	`end = tmp;`
`436`	`436`	`}`
`437`		`- n = end - start + 1;`
	`437`	`+ n = end - start;`
`438`	`438`	`mark_locations_array(start,n);`
`439`	`439`	`}`
`440`	`440`
`@@ -1106,11 +1106,11 @@ Init_stack(addr)`
`1106`	`1106`	`if (!addr) addr = (VALUE *)&addr;`
`1107`	`1107`	`if (rb_gc_stack_start) {`
`1108`	`1108`	`if (stack_growup_p(addr)) {`
`1109`		`- if (rb_gc_stack_start > addr)`
	`1109`	`+ if (rb_gc_stack_start > --addr)`
`1110`	`1110`	`rb_gc_stack_start = addr;`
`1111`	`1111`	`}`
`1112`	`1112`	`else {`
`1113`		`- if (rb_gc_stack_start < addr)`
	`1113`	`+ if (rb_gc_stack_start < ++addr)`
`1114`	`1114`	`rb_gc_stack_start = addr;`
`1115`	`1115`	`}`
`1116`	`1116`	`return;`