src,test: enable per_context.js shim

This reverts commit f5d29d5. PR-URL: nodejs#600 Refs: nodejs#565 Refs: nodejs#567 Reviewed-By: Jimmy Thomson <[email protected]> Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: Jack Horton <[email protected]>
kfarnung · Sep 18, 2018 · b8de4df · b8de4df
1 parent 49e76bc
commit b8de4df
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/lib/internal/per_context.js b/lib/internal/per_context.js
@@ -8,20 +8,18 @@
 
   // https://github.com/nodejs/node/issues/21219
   // Adds Atomics.notify and warns on first usage of Atomics.wake
+  // https://github.com/v8/v8/commit/c79206b363 adds Atomics.notify so
+  // now we alias Atomics.wake to notify so that we can remove it
+  // semver major without worrying about V8.
 
-  const AtomicsWake = global.Atomics.wake;
+  const AtomicsNotify = global.Atomics.notify;
   const ReflectApply = global.Reflect.apply;
 
-  // wrap for function.name
-  function notify(...args) {
-    return ReflectApply(AtomicsWake, this, args);
-  }
-
   const warning = 'Atomics.wake will be removed in a future version, ' +
     'use Atomics.notify instead.';
 
   let wakeWarned = false;
-  function wake(...args) {
+  function wake(typedArray, index, count) {
     if (!wakeWarned) {
       wakeWarned = true;
 
@@ -32,16 +30,10 @@
       }
     }
 
-    return ReflectApply(AtomicsWake, this, args);
+    return ReflectApply(AtomicsNotify, this, arguments);
   }
 
   global.Object.defineProperties(global.Atomics, {
-    notify: {
-      value: notify,
-      writable: true,
-      enumerable: false,
-      configurable: true,
-    },
     wake: {
       value: wake,
       writable: true,

diff --git a/src/node.cc b/src/node.cc
@@ -2978,7 +2978,6 @@ Local<Context> NewContext(Isolate* isolate,
   context->SetEmbedderData(
       ContextEmbedderIndex::kAllowWasmCodeGeneration, True(isolate));
 
-#ifndef NODE_ENGINE_CHAKRACORE
   {
     // Run lib/internal/per_context.js
     Context::Scope context_scope(context);
@@ -2989,7 +2988,6 @@ Local<Context> NewContext(Isolate* isolate,
         &per_context_src).ToLocalChecked();
     s->Run(context).ToLocalChecked();
   }
-#endif
 
   return context;
 }

diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
@@ -229,10 +229,6 @@ test-vm-createcacheddata : SKIP
 # Issue: https://github.com/nodejs/node-chakracore/issues/563
 test-zlib-unused-weak : SKIP
 
-# Removed the wake->notify shim code
-# Issue: https://github.com/nodejs/node-chakracore/issues/565
-test-atomics-notify : SKIP
-
 # These tests rely on V8's custom heap dumping and validation
 test-heapdump-dns : SKIP
 test-heapdump-fs-promise : SKIP