src: use NODE_BUILTIN_MODULE_CONTEXT_AWARE() macro

Commit d217b28 ("async_hooks: add trace events to async_hooks") used `NODE_MODULE_CONTEXT_AWARE_BUILTIN()` instead. After commit 8680bb9 ("src: explicitly register built-in modules") it no longer works for static library builds so remove it. PR-URL: #17071 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Timothy Gu <timothygu99@gmail.com>
nodejs · AndreasMadsen · Oct 22, 2017 · Nov 12, 2017 · Jul 17, 2017 · Nov 9, 2017
commit 1a66f91fa1adab3eaefaae8ab64e69abd915be57
diff --git a/src/node.h b/src/node.h
@@ -425,10 +425,6 @@ typedef void (*addon_context_register_func)(
     v8::Local<v8::Context> context,
     void* priv);
 
-#define NM_F_BUILTIN   0x01
-#define NM_F_LINKED    0x02
-#define NM_F_INTERNAL  0x04
-
 struct node_module {
   int nm_version;
   unsigned int nm_flags;
@@ -513,10 +509,6 @@ extern "C" NODE_EXTERN void node_module_register(void* mod);
   /* NOLINTNEXTLINE (readability/null_usage) */                       \
   NODE_MODULE_CONTEXT_AWARE_X(modname, regfunc, NULL, 0)
 
-#define NODE_MODULE_CONTEXT_AWARE_BUILTIN(modname, regfunc)           \
-  /* NOLINTNEXTLINE (readability/null_usage) */                       \
-  NODE_MODULE_CONTEXT_AWARE_X(modname, regfunc, NULL, NM_F_BUILTIN)   \
-
 /*
  * For backward compatibility in add-on modules.
  */

diff --git a/src/node_internals.h b/src/node_internals.h
@@ -38,6 +38,12 @@
 
 #include <string>
 
+enum {
+  NM_F_BUILTIN  = 1 << 0,
+  NM_F_LINKED   = 1 << 1,
+  NM_F_INTERNAL = 1 << 2,
+};
+
 struct sockaddr;
 
 // Variation on NODE_DEFINE_CONSTANT that sets a String value.
@@ -98,6 +104,7 @@ struct sockaddr;
     V(stream_wrap)                                                            \
     V(tcp_wrap)                                                               \
     V(timer_wrap)                                                             \
+    V(trace_events)                                                           \
     V(tty_wrap)                                                               \
     V(udp_wrap)                                                               \
     V(url)                                                                    \

diff --git a/src/node_trace_events.cc b/src/node_trace_events.cc
@@ -133,4 +133,4 @@ void InitializeTraceEvents(Local<Object> target,
 
 }  // namespace node
 
-NODE_MODULE_CONTEXT_AWARE_BUILTIN(trace_events, node::InitializeTraceEvents)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(trace_events, node::InitializeTraceEvents)
diff --git a/test/cctest/node_module_reg.cc b/test/cctest/node_module_reg.cc
@@ -20,6 +20,7 @@ void _register_spawn_sync() {}
 void _register_stream_wrap() {}
 void _register_tcp_wrap() {}
 void _register_timer_wrap() {}
+void _register_trace_events() {}
 void _register_tty_wrap() {}
 void _register_udp_wrap() {}
 void _register_util() {}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -133,4 +133,4 @@ void InitializeTraceEvents(Local<Object> target,

		} // namespace node

		NODE_MODULE_CONTEXT_AWARE_BUILTIN(trace_events, node::InitializeTraceEvents)
		NODE_BUILTIN_MODULE_CONTEXT_AWARE(trace_events, node::InitializeTraceEvents)