1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rvert r37827 and r37828

Browse Source 
Revert "Fix finalize of WeakRef"
This causes segv on rubyspec.
http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20121124T050101Z.log.html.gz

you can reproduce by
 make test-rubyspec MSPECOPT='-V library/weakref'

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37831 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-11-24 07:43:13 +00:00
parent 9d803dfd5f
commit 757413f6bb
3 changed files with 15 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ChangeLog
View File

@ -20,35 +20,6 @@ Sat Nov 24 12:28:04 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
(VALUE *), but 0 of variable argument seems not equal to null pointer (VALUE *), but 0 of variable argument seems not equal to null pointer
on x64 mingw. on x64 mingw.
Sat Nov 24 12:12:41 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
* gc.c (wmap_final_func): rename variables to clarify the meaning.
In wmap2obj the key is WeakRef and the value is referenced object.
In obj2wmap the key is referenced object and the value is an array
of WeakRef.
* gc.c (wmap_finalize): ditto.
[ruby-core:49044] [Bug #7304]
Sat Nov 24 12:10:26 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
* gc.c (wmap_final_func): remove WeakRef object reference from the
array.
* gc.c (wmap_finalize): remove recycled object references from weak
map hash properly. How to get object reference from object id was
wrong. st_delete() doesn't work properly if key and value arguments
are same. The key of obj2wmap is referenced object and the value of
obj2wmap is WeakRef array.
* gc.c (wmap_aset): obj2wmap should contain WeakRef array in the
definition.
* test/test_weakref.rb
(TestWeakRef#test_not_reference_different_object): add a test for
above.
[ruby-core:49044] [Bug #7304]
Sat Nov 24 11:47:14 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> Sat Nov 24 11:47:14 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* process.c (proc_getsid): adds new method for getting session id. * process.c (proc_getsid): adds new method for getting session id.

33
gc.c
View File

@ -3749,40 +3749,37 @@ wmap_allocate(VALUE klass)
static int static int
wmap_final_func(st_data_t *key, st_data_t *value, st_data_t arg, int existing) wmap_final_func(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
{ {
VALUE wmap, ary; VALUE obj, ary;
if (!existing) return ST_STOP; if (!existing) return ST_STOP;
wmap = (VALUE)arg, ary = (VALUE)*value; obj = (VALUE)*key, ary = (VALUE)*value;
rb_ary_delete(ary, wmap); rb_ary_delete(ary, obj);
if (!RARRAY_LEN(ary)) return ST_DELETE; if (!RARRAY_LEN(ary)) return ST_DELETE;
return ST_CONTINUE; return ST_CONTINUE;
} }
static VALUE static VALUE
wmap_finalize(VALUE self, VALUE objid) wmap_finalize(VALUE self, VALUE obj)
{ {
st_data_t orig, wmap, data; st_data_t data;
VALUE obj, rids; VALUE rids;
long i; long i;
struct weakmap *w; struct weakmap *w;
TypedData_Get_Struct(self, struct weakmap, &weakmap_type, w); TypedData_Get_Struct(self, struct weakmap, &weakmap_type, w);
/* Get reference from object id. */ obj = NUM2PTR(obj);
obj = objid ^ FIXNUM_FLAG; /* unset FIXNUM_FLAG */
/* obj is original referenced object and/or weak reference. */ data = (st_data_t)obj;
orig = (st_data_t)obj; if (st_delete(w->obj2wmap, &data, &data)) {
if (st_delete(w->obj2wmap, &orig, &data)) {
rids = (VALUE)data; rids = (VALUE)data;
for (i = 0; i < RARRAY_LEN(rids); ++i) { for (i = 0; i < RARRAY_LEN(rids); ++i) {
wmap = (st_data_t)RARRAY_PTR(rids)[i]; data = (st_data_t)RARRAY_PTR(rids)[i];
st_delete(w->wmap2obj, &wmap, NULL); st_delete(w->wmap2obj, &data, NULL);
} }
} }
wmap = (st_data_t)obj; data = (st_data_t)obj;
if (st_delete(w->wmap2obj, &wmap, &orig)) { if (st_delete(w->wmap2obj, &data, &data)) {
wmap = (st_data_t)obj; st_update(w->obj2wmap, (st_data_t)obj, wmap_final_func, 0);
st_update(w->obj2wmap, orig, wmap_final_func, wmap);
} }
return self; return self;
} }
@ -3804,7 +3801,7 @@ wmap_aset(VALUE self, VALUE wmap, VALUE orig)
rids = rb_ary_tmp_new(1); rids = rb_ary_tmp_new(1);
st_insert(w->obj2wmap, (st_data_t)orig, (st_data_t)rids); st_insert(w->obj2wmap, (st_data_t)orig, (st_data_t)rids);
} }
rb_ary_push(rids, wmap); rb_ary_push(rids, orig);
st_insert(w->wmap2obj, (st_data_t)wmap, (st_data_t)orig); st_insert(w->wmap2obj, (st_data_t)wmap, (st_data_t)orig);
return nonspecial_obj_id(orig); return nonspecial_obj_id(orig);
} }

19
test/test_weakref.rb
View File

@ -21,23 +21,4 @@ class TestWeakRef < Test::Unit::TestCase
ObjectSpace.garbage_collect ObjectSpace.garbage_collect
assert_raise(WeakRef::RefError) {weak.to_s} assert_raise(WeakRef::RefError) {weak.to_s}
end end
def test_not_reference_different_object
bug7304 = '[ruby-core:49044]'
weakrefs = []
3.times do
obj = Object.new
def obj.foo; end
weakrefs << WeakRef.new(obj)
ObjectSpace.garbage_collect
end
assert_nothing_raised(NoMethodError, bug7304) {
weakrefs.each do |weak|
begin
weak.foo
rescue WeakRef::RefError
end
end
}
end
end end