From a8103aa2a2bf86767356fdd4dca457f978256e62 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Fri, 6 Jan 2023 20:15:20 +0000
Subject: [PATCH] add acorn, walk to shared builtins

Last-Update: 2022-09-28
Forwarded: https://github.com/nodejs/node/pull/44376


Gbp-Pq: Topic build
Gbp-Pq: Name more_shareable_builtins.patch
---
 configure.py         |  4 +++-
 node.gyp             |  2 --
 src/node_builtins.cc | 13 +++++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/configure.py b/configure.py
index 81d54a14b..29437179c 100755
--- a/configure.py
+++ b/configure.py
@@ -59,7 +59,9 @@ with open ('tools/icu/icu_versions.json') as f:
 
 shareable_builtins = {'cjs_module_lexer/lexer': 'deps/cjs-module-lexer/lexer.js',
                      'cjs_module_lexer/dist/lexer': 'deps/cjs-module-lexer/dist/lexer.js',
-                     'undici/undici': 'deps/undici/undici.js'
+                     'undici/undici': 'deps/undici/undici.js',
+                     'acorn': 'deps/acorn/acorn/dist/acorn.js',
+                     'acorn_walk': 'deps/acorn/acorn-walk/dist/walk.js'
 }
 
 # create option groups
diff --git a/node.gyp b/node.gyp
index 1885a8d1e..49569746e 100644
--- a/node.gyp
+++ b/node.gyp
@@ -49,8 +49,6 @@
       'deps/v8/tools/tickprocessor.mjs',
       'deps/v8/tools/sourcemap.mjs',
       'deps/v8/tools/tickprocessor-driver.mjs',
-      'deps/acorn/acorn/dist/acorn.js',
-      'deps/acorn/acorn-walk/dist/walk.js',
       '<@(node_builtin_shareable_builtins)',
     ],
     'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
diff --git a/src/node_builtins.cc b/src/node_builtins.cc
index 9d82a06ad..2c8678cdb 100644
--- a/src/node_builtins.cc
+++ b/src/node_builtins.cc
@@ -49,6 +49,19 @@ BuiltinLoader::BuiltinLoader() : config_(GetConfig()), has_code_cache_(false) {
   AddExternalizedBuiltin("internal/deps/undici/undici",
                          STRINGIFY(NODE_SHARED_BUILTIN_UNDICI_UNDICI_PATH));
 #endif  // NODE_SHARED_BUILTIN_UNDICI_UNDICI_PATH
+
+#ifdef NODE_SHARED_BUILTIN_ACORN_PATH
+  AddExternalizedBuiltin(
+    "internal/deps/acorn/acorn/dist/acorn",
+    STRINGIFY(NODE_SHARED_BUILTIN_ACORN_PATH));
+#endif  // NODE_SHARED_BUILTIN_ACORN_PATH
+
+#ifdef NODE_SHARED_BUILTIN_ACORN_WALK_PATH
+  AddExternalizedBuiltin(
+    "internal/deps/acorn/acorn-walk/dist/walk",
+    STRINGIFY(NODE_SHARED_BUILTIN_ACORN_WALK_PATH));
+#endif  // NODE_SHARED_BUILTIN_ACORN_WALK_PATH
+
 #endif  // NODE_HAVE_I18N_SUPPORT
 }
 
-- 
2.30.2