src: remove virtually unused ExecScope

addaleax · addaleax · commit a564c1eb20a6 · 2017-09-14T17:38:44.000+02:00
PR-URL: nodejs#14697 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/env-inl.h b/src/env-inl.h
@@ -194,26 +194,6 @@ inline Environment::AsyncHooks::InitScope::~InitScope() {
   env_->async_hooks()->pop_ids(uid_fields_ref_[AsyncHooks::kCurrentAsyncId]);
 }
 
-inline Environment::AsyncHooks::ExecScope::ExecScope(
-    Environment* env, double async_id, double trigger_id)
-        : env_(env),
-          async_id_(async_id),
-          disposed_(false) {
-  CHECK_GE(async_id, -1);
-  CHECK_GE(trigger_id, -1);
-  env->async_hooks()->push_ids(async_id, trigger_id);
-}
-
-inline Environment::AsyncHooks::ExecScope::~ExecScope() {
-  if (disposed_) return;
-  Dispose();
-}
-
-inline void Environment::AsyncHooks::ExecScope::Dispose() {
-  disposed_ = true;
-  env_->async_hooks()->pop_ids(async_id_);
-}
-
 inline Environment::AsyncCallbackScope::AsyncCallbackScope(Environment* env)
     : env_(env) {
   env_->makecallback_cntr_++;
diff --git a/src/env.h b/src/env.h
@@ -421,25 +421,6 @@ class Environment {
       DISALLOW_COPY_AND_ASSIGN(InitScope);
     };
 
-    // Used to manage the stack of async and trigger ids as calls are made into
-    // JS. Mainly used in MakeCallback().
-    class ExecScope {
-     public:
-      ExecScope() = delete;
-      explicit ExecScope(Environment* env, double async_id, double trigger_id);
-      ~ExecScope();
-      void Dispose();
-
-     private:
-      Environment* env_;
-      double async_id_;
-      // Manually track if the destructor has run so it isn't accidentally run
-      // twice on RAII cleanup.
-      bool disposed_;
-
-      DISALLOW_COPY_AND_ASSIGN(ExecScope);
-    };
-
    private:
     friend class Environment;  // So we can call the constructor.
     inline explicit AsyncHooks(v8::Isolate* isolate);
diff --git a/src/node.cc b/src/node.cc
@@ -4692,8 +4692,9 @@ inline int Start(Isolate* isolate, IsolateData* isolate_data,
 
   {
     Environment::AsyncCallbackScope callback_scope(&env);
-    Environment::AsyncHooks::ExecScope exec_scope(&env, 1, 0);
+    env.async_hooks()->push_ids(1, 0);
     LoadEnvironment(&env);
+    env.async_hooks()->pop_ids(1);
   }
 
   env.set_trace_sync_io(trace_sync_io);

Original file line number	Diff line number	Diff line change
`@@ -4692,8 +4692,9 @@ inline int Start(Isolate* isolate, IsolateData* isolate_data,`
`4692`	`4692`
`4693`	`4693`	`{`
`4694`	`4694`	`Environment::AsyncCallbackScope callback_scope(&env);`
`4695`		`- Environment::AsyncHooks::ExecScope exec_scope(&env, 1, 0);`
	`4695`	`+ env.async_hooks()->push_ids(1, 0);`
`4696`	`4696`	`LoadEnvironment(&env);`
	`4697`	`+ env.async_hooks()->pop_ids(1);`
`4697`	`4698`	`}`
`4698`	`4699`
`4699`	`4700`	`env.set_trace_sync_io(trace_sync_io);`