diff --git a/src/env.h b/src/env.h index 9ad316c063ea72..12cf5b8855b4c1 100644 --- a/src/env.h +++ b/src/env.h @@ -160,9 +160,7 @@ struct PackageConfig { V(env_pairs_string, "envPairs") \ V(errno_string, "errno") \ V(error_string, "error") \ - V(exiting_string, "_exiting") \ V(exit_code_string, "exitCode") \ - V(exit_string, "exit") \ V(expire_string, "expire") \ V(exponent_string, "exponent") \ V(exports_string, "exports") \ diff --git a/src/node.cc b/src/node.cc index 2088f505d8c328..2ddaf6c80f2c7e 100644 --- a/src/node.cc +++ b/src/node.cc @@ -4117,10 +4117,11 @@ void EmitBeforeExit(Environment* env) { HandleScope handle_scope(env->isolate()); Context::Scope context_scope(env->context()); Local process_object = env->process_object(); - Local exit_code = FIXED_ONE_BYTE_STRING(env->isolate(), "exitCode"); + Local exit_code = env->exit_code_string(); Local args[] = { FIXED_ONE_BYTE_STRING(env->isolate(), "beforeExit"), - process_object->Get(exit_code)->ToInteger(env->context()).ToLocalChecked() + process_object->Get(env->context(), exit_code).ToLocalChecked() + ->ToInteger(env->context()).ToLocalChecked() }; MakeCallback(env->isolate(), process_object, "emit", arraysize(args), args, @@ -4133,13 +4134,15 @@ int EmitExit(Environment* env) { HandleScope handle_scope(env->isolate()); Context::Scope context_scope(env->context()); Local process_object = env->process_object(); - process_object->Set(env->exiting_string(), True(env->isolate())); + process_object->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "_exiting"), + True(env->isolate())); - Local exitCode = env->exit_code_string(); - int code = process_object->Get(exitCode)->Int32Value(); + Local exit_code = env->exit_code_string(); + int code = process_object->Get(env->context(), exit_code).ToLocalChecked() + ->Int32Value(env->context()).ToChecked(); Local args[] = { - env->exit_string(), + FIXED_ONE_BYTE_STRING(env->isolate(), "exit"), Integer::New(env->isolate(), code) }; @@ -4148,7 +4151,8 @@ int EmitExit(Environment* env) { {0, 0}).ToLocalChecked(); // Reload exit code, it may be changed by `emit('exit')` - return process_object->Get(exitCode)->Int32Value(); + return process_object->Get(env->context(), exit_code).ToLocalChecked() + ->Int32Value(env->context()).ToChecked(); }