1 files changed, 23 insertions, 1 deletions
diff --git a/bootstraptest/test_objectspace.rb b/bootstraptest/test_objectspace.rb
index 1a43d42017..63a8d99322 100644
--- a/bootstraptest/test_objectspace.rb
+++ b/bootstraptest/test_objectspace.rb
@@ -2,7 +2,8 @@ assert_normal_exit %q{
   eval("", TOPLEVEL_BINDING)
   minobj = ObjectSpace.to_enum(:each_object).min_by {|a| a.object_id }
   maxobj = ObjectSpace.to_enum(:each_object).max_by {|a| a.object_id }
-  minobj.object_id.upto(maxobj.object_id) {|id|
+  (((minobj.object_id-100)..(minobj.object_id+100))+
+   ((maxobj.object_id-100)..(maxobj.object_id+100))).each {|id|
     begin
       o = ObjectSpace._id2ref(id)
     rescue RangeError
@@ -31,3 +32,24 @@ assert_normal_exit %q{
     end
   }
 }, '[ruby-dev:31985]'
+
+assert_normal_exit %q{
+  ObjectSpace.define_finalizer("") do
+    Thread::Mutex.new.lock
+  end
+}, '[ruby-dev:44049]'
+
+assert_normal_exit %q{
+  ObjectSpace.define_finalizer("") do
+    Thread.new {}
+  end
+}, '[ruby-core:37858]'
+
+assert_equal 'ok', %q{
+  objects_and_ids = 1000.times.map { o = Object.new; [o, o.object_id] }
+  objects_and_ids.each { |expected, id|
+    actual = ObjectSpace._id2ref(id)
+    raise "expected #{expected.inspect}, got #{actual.inspect}" unless actual.equal?(expected)
+  }
+  'ok'
+}