From d729c1575e794bb9dafd1f7fcb0740735537504a Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Tue, 28 Jan 2025 10:15:27 -0500
Subject: [PATCH] Output object_id in ObjectSpace.dump

Outputs the object ID in the dump for objects that have it seen.
---
 ext/objspace/objspace_dump.c   |  5 +++++
 test/objspace/test_objspace.rb | 14 ++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/ext/objspace/objspace_dump.c b/ext/objspace/objspace_dump.c
index 96bd521c79..2b98214f69 100644
--- a/ext/objspace/objspace_dump.c
+++ b/ext/objspace/objspace_dump.c
@@ -638,6 +638,11 @@ dump_object(VALUE obj, struct dump_config *dc)
         dump_append_sizet(dc, memsize);
     }
 
+    if (FL_TEST(obj, FL_SEEN_OBJ_ID)) {
+        dump_append(dc, ", \"object_id\":");
+        dump_append_lu(dc, RB_NUM2ULONG(rb_obj_id(obj)));
+    }
+
     if ((n = rb_obj_gc_flags(obj, flags, sizeof(flags))) > 0) {
         dump_append(dc, ", \"flags\":{");
         for (i=0; i<n; i++) {
diff --git a/test/objspace/test_objspace.rb b/test/objspace/test_objspace.rb
index e0dde3621c..939092e1c1 100644
--- a/test/objspace/test_objspace.rb
+++ b/test/objspace/test_objspace.rb
@@ -486,6 +486,20 @@ class TestObjSpace < Test::Unit::TestCase
     assert_match(/"value":"foobar\h+"/, dump)
   end
 
+  def test_dump_outputs_object_id
+    obj = Object.new
+
+    # Doesn't output object_id when it has not been seen
+    dump = ObjectSpace.dump(obj)
+    assert_not_include(dump, "\"object_id\"")
+
+    id = obj.object_id
+
+    # Outputs object_id when it has been seen
+    dump = ObjectSpace.dump(obj)
+    assert_include(dump, "\"object_id\":#{id}")
+  end
+
   def test_dump_includes_imemo_type
     assert_in_out_err(%w[-robjspace], "#{<<-"begin;"}\n#{<<-'end;'}") do |output, error|
       begin;