Skip to content

src: refactor Environment::GetCurrent() usage #22819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
addaleax wants to merge 3 commits into from
Closed

src: refactor Environment::GetCurrent() usage #22819

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba49760
src: refactor `Environment::GetCurrent()` usage
addaleax Sep 12, 2018
e58f577
fixup! src: refactor `Environment::GetCurrent()` usage
addaleax Sep 13, 2018
f155627
fixup! src: refactor `Environment::GetCurrent()` usage
addaleax Sep 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup! src: refactor Environment::GetCurrent() usage
  • Loading branch information
@addaleax
addaleax committed Sep 13, 2018
commit e58f577bbc361d309cf49840882493378b3a4157
5 changes: 3 additions & 2 deletions src/env-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,11 +294,12 @@ inline Environment* Environment::GetCurrent(v8::Isolate* isolate) {
}

inline Environment* Environment::GetCurrent(v8::Local<v8::Context> context) {
Comment thread
addaleax marked this conversation as resolved.
if (context->GetNumberOfEmbedderDataFields() <
if (UNLIKELY(context.IsEmpty() ||
context->GetNumberOfEmbedderDataFields() <
ContextEmbedderIndex::kContextTag ||
context->GetAlignedPointerFromEmbedderData(
ContextEmbedderIndex::kContextTag) !=
Environment::kNodeContextTagPtr) {
Environment::kNodeContextTagPtr)) {
return nullptr;
}

Expand Down
2 changes: 2 additions & 0 deletions test/cctest/test_environment.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ TEST_F(EnvironmentTest, NonNodeJSContext) {
const Argv argv;
Env test_env {handle_scope, argv};

EXPECT_EQ(node::Environment::GetCurrent(v8::Local<v8::Context>()), nullptr);

node::Environment* env = *test_env;
EXPECT_EQ(node::Environment::GetCurrent(isolate_), env);
EXPECT_EQ(node::Environment::GetCurrent(env->context()), env);
Expand Down