1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: use more appropriate context-entered check

Browse Source 
Make the context check in `MakeCallback` match what the comment says
(and what actually makes sense).

PR-URL: https://github.com/nodejs/node/pull/15691
Fixes: https://github.com/nodejs/node/issues/15672
Ref: https://github.com/nodejs/node/pull/15428
Ref: f27b5e4bdaafc73a830a0451ee3c641b8bcd08fe
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Eugene Ostroukhov <eostroukhov@google.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
This commit is contained in:
Anna Henningsen 2017-09-29 23:35:43 +02:00
parent b050c14d91
commit 037d9085f1
No known key found for this signature in database
GPG Key ID: 9C63F3A6CD2AD8F9
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/node.cc
View File

@ -1383,7 +1383,7 @@ InternalCallbackScope::InternalCallbackScope(Environment* env,
HandleScope handle_scope(env->isolate());
// If you hit this assertion, you forgot to enter the v8::Context first.
CHECK_EQ(env->context(), env->isolate()->GetCurrentContext());
CHECK_EQ(Environment::GetCurrent(env->isolate()), env);
if (env->using_domains() && !object_.IsEmpty()) {
DomainEnter(env, object_);

8
test/inspector/test-scriptparsed-context.js
View File

@ -37,6 +37,8 @@ const script = `
vm.runInNewContext('Array', {});
debugger;
vm.runInNewContext('debugger', {});
`;
async function getContext(session) {
@ -92,6 +94,12 @@ async function runTests() {
await checkScriptContext(session, thirdContext);
await session.waitForBreakOnLine(33, '[eval]');
console.error('[test]', 'vm.runInNewContext can contain debugger statements');
await session.send({ 'method': 'Debugger.resume' });
const fourthContext = await getContext(session);
await checkScriptContext(session, fourthContext);
await session.waitForBreakOnLine(0, 'evalmachine.<anonymous>');
await session.runToCompletion();
assert.strictEqual(0, (await instance.expectShutdown()).exitCode);
}