Skip to content

Commit dd85a8d

Browse files
committed
src: fix outdated js2c.cc references
nodejs/node#56133
1 parent 809c912 commit dd85a8d

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

patches/node/build_add_gn_build_files.patch

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2247,19 +2247,6 @@ index 706ea4f5cb90525c8ea56f794320a733c45a193f..c7ae7759595bfc7fdc31dab174a7514d
22472247
}
22482248

22492249
} // namespace builtins
2250-
diff --git a/src/node_builtins.h b/src/node_builtins.h
2251-
index 1cb85b9058d06555382e565dc32192a9fa48ed9f..cec9be01abd107e8612f70daf19b4834e118ffcf 100644
2252-
--- a/src/node_builtins.h
2253-
+++ b/src/node_builtins.h
2254-
@@ -74,6 +74,8 @@ using BuiltinCodeCacheMap =
2255-
// Generated by tools/js2c.py as node_javascript.cc
2256-
void RegisterExternalReferencesForInternalizedBuiltinCode(
2257-
ExternalReferenceRegistry* registry);
2258-
+void EmbedderRegisterExternalReferencesForInternalizedBuiltinCode(
2259-
+ ExternalReferenceRegistry* registry);
2260-
2261-
// Handles compilation and caching of built-in JavaScript modules and
2262-
// bootstrap scripts, whose source are bundled into the binary as static data.
22632250
diff --git a/tools/generate_gn_filenames_json.py b/tools/generate_gn_filenames_json.py
22642251
new file mode 100755
22652252
index 0000000000000000000000000000000000000000..37c16859003e61636fe2f1a4040b1e904c472d0b

patches/node/build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,18 @@ diff --git a/src/node_builtins.h b/src/node_builtins.h
4949
index cec9be01abd107e8612f70daf19b4834e118ffcf..3d9c6b962423555257bad4ebaad9ebd821d00042 100644
5050
--- a/src/node_builtins.h
5151
+++ b/src/node_builtins.h
52+
@@ -74,6 +74,8 @@ using BuiltinCodeCacheMap =
53+
// Generated by tools/js2c.cc as node_javascript.cc
54+
void RegisterExternalReferencesForInternalizedBuiltinCode(
55+
ExternalReferenceRegistry* registry);
56+
+void EmbedderRegisterExternalReferencesForInternalizedBuiltinCode(
57+
+ ExternalReferenceRegistry* registry);
58+
59+
// Handles compilation and caching of built-in JavaScript modules and
60+
// bootstrap scripts, whose source are bundled into the binary as static data.
5261
@@ -138,6 +138,7 @@ class NODE_EXTERN_PRIVATE BuiltinLoader {
5362

54-
// Generated by tools/js2c.py as node_javascript.cc
63+
// Generated by tools/js2c.cc as node_javascript.cc
5564
void LoadJavaScriptSource(); // Loads data into source_
5665
+ void LoadEmbedderJavaScriptSource(); // Loads embedder data into source_
5766
UnionBytes GetConfig(); // Return data for config.gypi

0 commit comments

Comments
 (0)