nodejs
diff --git a/Collapse file
‎doc/api/vm.md‎
Copy file name to clipboardExpand all lines: doc/api/vm.md
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff b/Collapse file
‎doc/api/vm.md‎
Copy file name to clipboardExpand all lines: doc/api/vm.md
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff
diff --git a/Collapse file
‎src/node_contextify.cc‎
Copy file name to clipboardExpand all lines: src/node_contextify.cc
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎src/node_contextify.cc‎
Copy file name to clipboardExpand all lines: src/node_contextify.cc
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎test/parallel/test-vm-basic.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-vm-basic.js
+40Lines changed: 40 additions & 0 deletions b/Collapse file
‎test/parallel/test-vm-basic.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-vm-basic.js
+40Lines changed: 40 additions & 0 deletions
@@ -655,8 +655,8 @@ added: v10.10.0
     data for the supplied source.
   * `produceCachedData` {boolean} Specifies whether to produce new cache data.
     **Default:** `false`.
-  * `parsingContext` {Object} The sandbox/context in which the said function
-    should be compiled in.
+  * `parsingContext` {Object} The [contextified][] sandbox in which the said
+    function should be compiled in.
   * `contextExtensions` {Object[]} An array containing a collection of context
     extensions (objects wrapping the current scope) to be applied while
     compiling. **Default:** `[]`.
 
@@ -1053,7 +1053,7 @@ void ContextifyContext::CompileFunction(
   }
 
   MaybeLocal<Function> maybe_fun = ScriptCompiler::CompileFunctionInContext(
-      context, &source, params.size(), params.data(),
+      parsing_context, &source, params.size(), params.data(),
       context_extensions.size(), context_extensions.data(), options);
 
   Local<Function> fun;
 
@@ -267,6 +267,46 @@ const vm = require('vm');
     stack: 'Error: Sample Error\n    at <anonymous>:1:10'
   });
 
+  assert.strictEqual(
+    vm.compileFunction(
+      'return varInContext',
+      [],
+      {
+        parsingContext: vm.createContext({ varInContext: 'abc' })
+      }
+    )(),
+    'abc'
+  );
+
+  common.expectsError(() => {
+    vm.compileFunction(
+      'return varInContext',
+      []
+    )();
+  }, {
+    message: 'varInContext is not defined',
+    stack: 'ReferenceError: varInContext is not defined\n    at <anonymous>:1:1'
+  });
+
+  assert.notDeepStrictEqual(
+    vm.compileFunction(
+      'return global',
+      [],
+      {
+        parsingContext: vm.createContext({ global: {} })
+      }
+    )(),
+    global
+  );
+
+  assert.deepStrictEqual(
+    vm.compileFunction(
+      'return global',
+      []
+    )(),
+    global
+  );
+
   // Resetting value
   Error.stackTraceLimit = oldLimit;
 }
Original file line number	Diff line number	Diff line change
`@@ -1053,7 +1053,7 @@ void ContextifyContext::CompileFunction(`
`1053`	`1053`	`}`
`1054`	`1054`
`1055`	`1055`	`MaybeLocal<Function> maybe_fun = ScriptCompiler::CompileFunctionInContext(`
`1056`		`- context, &source, params.size(), params.data(),`
	`1056`	`+ parsing_context, &source, params.size(), params.data(),`
`1057`	`1057`	`context_extensions.size(), context_extensions.data(), options);`
`1058`	`1058`
`1059`	`1059`	`Local<Function> fun;`