lib: remove bootstrap global context indirection

PR-URL: nodejs#5881 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Conflicts: lib/internal/bootstrap_node.js src/node.cc
Fishrock123 · Apr 7, 2016 · daa191f · daa191f
1 parent e966d1f
commit daa191f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/internal/bootstrap_node.js b/lib/internal/bootstrap_node.js
@@ -8,7 +8,6 @@
 'use strict';
 
 (function(process) {
-  this.global = this;
 
   function startup() {
     var EventEmitter = NativeModule.require('events');
@@ -200,7 +199,6 @@
 
   function setupGlobalVariables() {
     global.process = process;
-    global.global = global;
     global.GLOBAL = global;
     global.root = global;
     global.Buffer = NativeModule.require('buffer').Buffer;

diff --git a/src/node.cc b/src/node.cc
@@ -117,6 +117,7 @@ using v8::Local;
 using v8::Locker;
 using v8::MaybeLocal;
 using v8::Message;
+using v8::Null;
 using v8::Number;
 using v8::Object;
 using v8::ObjectTemplate;
@@ -3257,8 +3258,12 @@ void LoadEnvironment(Environment* env) {
 
   env->SetMethod(env->process_object(), "_rawDebug", RawDebug);
 
+  // Expose the global object as a property on itself
+  // (Allows you to set stuff on `global` from anywhere in JavaScript.)
+  global->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "global"), global);
+
   Local<Value> arg = env->process_object();
-  f->Call(global, 1, &arg);
+  f->Call(Null(env->isolate()), 1, &arg);
 }
 
 static void PrintHelp();