diff options
author | Anna Henningsen <anna@addaleax.net> | 2019-01-30 21:07:11 +0100 |
---|---|---|
committer | Anna Henningsen <anna@addaleax.net> | 2019-02-03 20:41:53 +0100 |
commit | 270ffb0fa7dc9a771f6a4029ee5b77ed490eb8e8 (patch) | |
tree | 6186203ec44235dc4d1f0d07ed15529fe3862c0d /src | |
parent | cca897ef5d92b20c7862fab00116ea0727439c10 (diff) | |
download | android-node-v8-270ffb0fa7dc9a771f6a4029ee5b77ed490eb8e8.tar.gz android-node-v8-270ffb0fa7dc9a771f6a4029ee5b77ed490eb8e8.tar.bz2 android-node-v8-270ffb0fa7dc9a771f6a4029ee5b77ed490eb8e8.zip |
src,lib: remove dead `process.binding()` code
There are no non-internal builtin modules left, so this
should be safe to remove to a large degree.
PR-URL: https://github.com/nodejs/node/pull/25829
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anto Aravinth <anto.aravinth.cse@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'src')
-rw-r--r-- | src/node.cc | 4 | ||||
-rw-r--r-- | src/node_binding.cc | 36 | ||||
-rw-r--r-- | src/node_binding.h | 8 |
3 files changed, 4 insertions, 44 deletions
diff --git a/src/node.cc b/src/node.cc index 8593daeefc..62f4550265 100644 --- a/src/node.cc +++ b/src/node.cc @@ -282,7 +282,6 @@ MaybeLocal<Value> RunBootstrapping(Environment* env) { // Create binding loaders std::vector<Local<String>> loaders_params = { env->process_string(), - FIXED_ONE_BYTE_STRING(isolate, "getBinding"), FIXED_ONE_BYTE_STRING(isolate, "getLinkedBinding"), FIXED_ONE_BYTE_STRING(isolate, "getInternalBinding"), // --experimental-modules @@ -292,9 +291,6 @@ MaybeLocal<Value> RunBootstrapping(Environment* env) { env->primordials_string()}; std::vector<Local<Value>> loaders_args = { process, - env->NewFunctionTemplate(binding::GetBinding) - ->GetFunction(context) - .ToLocalChecked(), env->NewFunctionTemplate(binding::GetLinkedBinding) ->GetFunction(context) .ToLocalChecked(), diff --git a/src/node_binding.cc b/src/node_binding.cc index 85f3c19e69..08d55567d4 100644 --- a/src/node_binding.cc +++ b/src/node_binding.cc @@ -84,7 +84,7 @@ // function for each built-in modules explicitly in // binding::RegisterBuiltinModules(). This is only forward declaration. // The definitions are in each module's implementation when calling -// the NODE_BUILTIN_MODULE_CONTEXT_AWARE. +// the NODE_MODULE_CONTEXT_AWARE_INTERNAL. #define V(modname) void _register_##modname(); NODE_BUILTIN_MODULES(V) #undef V @@ -101,7 +101,6 @@ using v8::String; using v8::Value; // Globals per process -static node_module* modlist_builtin; static node_module* modlist_internal; static node_module* modlist_linked; static node_module* modlist_addon; @@ -114,10 +113,7 @@ bool node_is_initialized = false; extern "C" void node_module_register(void* m) { struct node_module* mp = reinterpret_cast<struct node_module*>(m); - if (mp->nm_flags & NM_F_BUILTIN) { - mp->nm_link = modlist_builtin; - modlist_builtin = mp; - } else if (mp->nm_flags & NM_F_INTERNAL) { + if (mp->nm_flags & NM_F_INTERNAL) { mp->nm_link = modlist_internal; modlist_internal = mp; } else if (!node_is_initialized) { @@ -295,11 +291,7 @@ void DLOpen(const FunctionCallbackInfo<Value>& args) { env->ThrowError(errmsg); return false; } - if (mp->nm_flags & NM_F_BUILTIN) { - dlib->Close(); - env->ThrowError("Built-in module self-registered."); - return false; - } + CHECK_EQ(mp->nm_flags & NM_F_BUILTIN, 0); mp->nm_dso_handle = dlib->handle_; mp->nm_link = modlist_addon; @@ -335,9 +327,6 @@ inline struct node_module* FindModule(struct node_module* list, return mp; } -node_module* get_builtin_module(const char* name) { - return FindModule(modlist_builtin, name, NM_F_BUILTIN); -} node_module* get_internal_module(const char* name) { return FindModule(modlist_internal, name, NM_F_INTERNAL); } @@ -363,25 +352,6 @@ static void ThrowIfNoSuchModule(Environment* env, const char* module_v) { env->ThrowError(errmsg); } -void GetBinding(const FunctionCallbackInfo<Value>& args) { - Environment* env = Environment::GetCurrent(args); - - CHECK(args[0]->IsString()); - - Local<String> module = args[0].As<String>(); - node::Utf8Value module_v(env->isolate(), module); - - node_module* mod = get_builtin_module(*module_v); - Local<Object> exports; - if (mod != nullptr) { - exports = InitModule(env, mod, module); - } else { - return ThrowIfNoSuchModule(env, *module_v); - } - - args.GetReturnValue().Set(exports); -} - void GetInternalBinding(const FunctionCallbackInfo<Value>& args) { Environment* env = Environment::GetCurrent(args); diff --git a/src/node_binding.h b/src/node_binding.h index 7d79dae80d..d73e18548f 100644 --- a/src/node_binding.h +++ b/src/node_binding.h @@ -15,7 +15,7 @@ #include "v8.h" enum { - NM_F_BUILTIN = 1 << 0, + NM_F_BUILTIN = 1 << 0, // Unused. NM_F_LINKED = 1 << 1, NM_F_INTERNAL = 1 << 2, }; @@ -33,9 +33,6 @@ enum { nullptr}; \ void _register_##modname() { node_module_register(&_module); } -#define NODE_BUILTIN_MODULE_CONTEXT_AWARE(modname, regfunc) \ - NODE_MODULE_CONTEXT_AWARE_CPP(modname, regfunc, nullptr, NM_F_BUILTIN) - void napi_module_register_by_symbol(v8::Local<v8::Object> exports, v8::Local<v8::Value> module, v8::Local<v8::Context> context, @@ -83,7 +80,6 @@ class DLib { // use the __attribute__((constructor)). Need to // explicitly call the _register* functions. void RegisterBuiltinModules(); -void GetBinding(const v8::FunctionCallbackInfo<v8::Value>& args); void GetInternalBinding(const v8::FunctionCallbackInfo<v8::Value>& args); void GetLinkedBinding(const v8::FunctionCallbackInfo<v8::Value>& args); void DLOpen(const v8::FunctionCallbackInfo<v8::Value>& args); @@ -92,7 +88,5 @@ void DLOpen(const v8::FunctionCallbackInfo<v8::Value>& args); } // namespace node -#include "node_binding.h" - #endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS #endif // SRC_NODE_BINDING_H_ |