src: expose BaseObject::kInternalFieldCount in post-mortem metadata

So that the debugger does not have to hard-code the number of internal fields of BaseObjects. PR-URL: #37111 Refs: #36943 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Feb 2, 2021 · a26dfb3 · a26dfb3
1 parent 3c90771
commit a26dfb3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/node_postmortem_metadata.cc b/src/node_postmortem_metadata.cc
@@ -36,6 +36,7 @@
 
 extern "C" {
 int nodedbg_const_ContextEmbedderIndex__kEnvironment__int;
+int nodedbg_const_BaseObject__kInternalFieldCount__int;
 uintptr_t nodedbg_offset_ExternalString__data__uintptr_t;
 uintptr_t nodedbg_offset_ReqWrap__req_wrap_queue___ListNode_ReqWrapQueue;
 
@@ -50,6 +51,8 @@ namespace node {
 int GenDebugSymbols() {
   nodedbg_const_ContextEmbedderIndex__kEnvironment__int =
       ContextEmbedderIndex::kEnvironment;
+  nodedbg_const_BaseObject__kInternalFieldCount__int =
+      BaseObject::kInternalFieldCount;
 
   nodedbg_offset_ExternalString__data__uintptr_t = NODE_OFF_EXTSTR_DATA;
   nodedbg_offset_ReqWrap__req_wrap_queue___ListNode_ReqWrapQueue =

diff --git a/test/cctest/test_node_postmortem_metadata.cc b/test/cctest/test_node_postmortem_metadata.cc
@@ -14,6 +14,7 @@ extern uintptr_t
     nodedbg_offset_Environment__handle_wrap_queue___Environment_HandleWrapQueue;
 extern int debug_symbols_generated;
 extern int nodedbg_const_ContextEmbedderIndex__kEnvironment__int;
+extern int nodedbg_const_BaseObject__kInternalFieldCount__int;
 extern uintptr_t
     nodedbg_offset_Environment_HandleWrapQueue__head___ListNode_HandleWrap;
 extern uintptr_t
@@ -68,6 +69,12 @@ TEST_F(DebugSymbolsTest, ContextEmbedderEnvironmentIndex) {
             kEnvironmentIndex);
 }
 
+TEST_F(DebugSymbolsTest, BaseObjectkInternalFieldCount) {
+  int kInternalFieldCount = node::BaseObject::kInternalFieldCount;
+  EXPECT_EQ(nodedbg_const_BaseObject__kInternalFieldCount__int,
+            kInternalFieldCount);
+}
+
 TEST_F(DebugSymbolsTest, ExternalStringDataOffset) {
   EXPECT_EQ(nodedbg_offset_ExternalString__data__uintptr_t,
             NODE_OFF_EXTSTR_DATA);
@@ -89,7 +96,8 @@ TEST_F(DebugSymbolsTest, BaseObjectPersistentHandle) {
   Env env{handle_scope, argv};
 
   v8::Local<v8::ObjectTemplate> obj_templ = v8::ObjectTemplate::New(isolate_);
-  obj_templ->SetInternalFieldCount(1);
+  obj_templ->SetInternalFieldCount(
+      nodedbg_const_BaseObject__kInternalFieldCount__int);
 
   v8::Local<v8::Object> object =
       obj_templ->NewInstance(env.context()).ToLocalChecked();
@@ -139,7 +147,8 @@ TEST_F(DebugSymbolsTest, HandleWrapList) {
   uv_tcp_t handle;
 
   auto obj_template = v8::FunctionTemplate::New(isolate_);
-  obj_template->InstanceTemplate()->SetInternalFieldCount(1);
+  obj_template->InstanceTemplate()->SetInternalFieldCount(
+      nodedbg_const_BaseObject__kInternalFieldCount__int);
 
   v8::Local<v8::Object> object = obj_template->GetFunction(env.context())
                                      .ToLocalChecked()
@@ -171,7 +180,8 @@ TEST_F(DebugSymbolsTest, ReqWrapList) {
   tail = *reinterpret_cast<uintptr_t*>(tail);
 
   auto obj_template = v8::FunctionTemplate::New(isolate_);
-  obj_template->InstanceTemplate()->SetInternalFieldCount(1);
+  obj_template->InstanceTemplate()->SetInternalFieldCount(
+      nodedbg_const_BaseObject__kInternalFieldCount__int);
 
   v8::Local<v8::Object> object = obj_template->GetFunction(env.context())
                                      .ToLocalChecked()