src: use more appropriate context-entered check

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

PR-URL: nodejs/node#15691
Fixes: nodejs/node#15672
Ref: nodejs/node#15428
Ref: f27b5e4bdaafc73a830a0451ee3c641b8bcd08fe
Reviewed-By: Refael Ackermann <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Eugene Ostroukhov <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Timothy Gu <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>

Author: addaleax

src/node.cc

@@ -1415,7 +1415,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_);

test/inspector/test-scriptparsed-context.js

@@ -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);
 }