[v10.x] src: more automatic memory management in node_crypto.cc

COLLABORATOR_GUIDE.md

@@ -416,14 +416,15 @@ longer be used.
 
 Node.js uses three Deprecation levels:
 
-* *Documentation-Only Deprecation* refers to elements of the Public API that are
-  being staged for deprecation in a future Node.js major release. An explicit
-  notice indicating the deprecated status is added to the API documentation
-  but no functional changes are implemented in the code. There will be no
-  runtime deprecation warnings emitted for such deprecations by default.
-  Documentation-only deprecations may trigger a runtime warning when Node.js
-  is started with the [`--pending-deprecation`][] flag or the
-  `NODE_PENDING_DEPRECATION=1` environment variable is set.
+* *Documentation-Only Deprecation* refers to elements of the Public API that
+  should be avoided by developers and that might be staged for a runtime
+  deprecation in a future Node.js major release. An explicit notice indicating
+  the deprecation status is added to the API documentation but no functional
+  changes are implemented in the code. By default there will be no deprecation
+  warnings emitted for such deprecations at runtime. Documentation-only
+  deprecations may trigger a runtime warning when Node.js is started with the
+  [`--pending-deprecation`][] flag or the `NODE_PENDING_DEPRECATION=1`
+  environment variable is set.
 
 * *Runtime Deprecation* refers to the use of process warnings emitted at
   runtime the first time that a deprecated API is used. A command-line
@@ -831,7 +832,6 @@ LTS working group and the Release team.
 | Subsystem                                | Maintainers                                                           |
 | ---                                      | ---                                                                   |
 | `benchmark/*`                            | @nodejs/benchmarking, @mscdex                                         |
-| `bootstrap_node.js`                      | @nodejs/process                                                       |
 | `doc/*`, `*.md`                          | @nodejs/documentation                                                 |
 | `lib/assert`                             | @nodejs/testing                                                       |
 | `lib/async_hooks`                        | @nodejs/async\_hooks for bugs/reviews (+ @nodejs/diagnostics for API) |
@@ -844,20 +844,21 @@ LTS working group and the Release team.
 | `lib/fs`, `src/{fs,file}`                | @nodejs/fs                                                            |
 | `lib/{_}http{*}`                         | @nodejs/http                                                          |
 | `lib/inspector.js`, `src/inspector_*`    | @nodejs/V8-inspector                                                  |
+| `lib/internal/bootstrap/*`               | @nodejs/process                                                       |
 | `lib/internal/url`, `src/node_url`       | @nodejs/url                                                           |
 | `lib/net`                                | @bnoordhuis, @indutny, @nodejs/streams                                |
 | `lib/repl`                               | @nodejs/repl                                                          |
 | `lib/{_}stream{*}`                       | @nodejs/streams                                                       |
 | `lib/timers`                             | @nodejs/timers                                                        |
 | `lib/util`                               | @nodejs/util                                                          |
 | `lib/zlib`                               | @nodejs/zlib                                                          |
-| `src/async-wrap.*`                       | @nodejs/async\_hooks                                                  |
+| `src/async_wrap.*`                       | @nodejs/async\_hooks                                                  |
 | `src/node_api.*`                         | @nodejs/n-api                                                         |
 | `src/node_crypto.*`                      | @nodejs/crypto                                                        |
 | `test/*`                                 | @nodejs/testing                                                       |
 | `tools/node_modules/eslint`, `.eslintrc` | @nodejs/linting                                                       |
 | build                                    | @nodejs/build                                                         |
-| `src/module_wrap.*`, `lib/internal/loader/*`, `lib/internal/vm/Module.js` | @nodejs/modules                      |
+| `src/module_wrap.*`, `lib/internal/modules/*`, `lib/internal/vm/module.js` | @nodejs/modules                     |
 | GYP                                      | @nodejs/gyp                                                           |
 | performance                              | @nodejs/performance                                                   |
 | platform specific                        | @nodejs/platform-{aix,arm,freebsd,macos,ppc,smartos,s390,windows}     |

CPP_STYLE_GUIDE.md

@@ -12,6 +12,7 @@
   * [CamelCase for methods, functions, and classes](#camelcase-for-methods-functions-and-classes)
   * [snake\_case for local variables and parameters](#snake_case-for-local-variables-and-parameters)
   * [snake\_case\_ for private class fields](#snake_case_-for-private-class-fields)
+  * [snake\_case\_ for C-like structs](#snake_case_-for-c-like-structs)
   * [Space after `template`](#space-after-template)
 * [Memory Management](#memory-management)
   * [Memory allocation](#memory-allocation)
@@ -147,6 +148,15 @@ class Foo {
 };
 ```
 
+## snake\_case\_ for C-like structs
+For plain C-like structs snake_case can be used.
+
+```c++
+struct foo_bar {
+  int name;
+}
+```
+
 ## Space after `template`
 
 ```c++

Makefile

@@ -813,8 +813,8 @@ release-only:
 		exit 1 ; \
 	fi
 	@if [ "$(DISTTYPE)" != "nightly" ] && [ "$(DISTTYPE)" != "next-nightly" ] && \
-		`grep -q DEP00XX doc/api/deprecations.md`; then \
-		echo 'Please update DEP00XX in doc/api/deprecations.md (See doc/releases.md)' ; \
+		`grep -q DEP...X doc/api/deprecations.md`; then \
+		echo 'Please update DEP...X in doc/api/deprecations.md (See doc/releases.md)' ; \
 		exit 1 ; \
 	fi
 	@if [ "$(shell git status --porcelain | egrep -v '^\?\? ')" = "" ]; then \

README.md

@@ -514,8 +514,6 @@ For more information about the governance of the Node.js project, see
 **Trivikram Kamat** <trivikr.dev@gmail.com>
 * [Trott](https://github.com/Trott) -
 **Rich Trott** <rtrott@gmail.com> (he/him)
-* [tunniclm](https://github.com/tunniclm) -
-**Mike Tunnicliffe** <m.j.tunnicliffe@gmail.com>
 * [vdeturckheim](https://github.com/vdeturckheim) -
 **Vladimir de Turckheim** <vlad2t@hotmail.com> (he/him)
 * [vkurchatkin](https://github.com/vkurchatkin) -
@@ -559,6 +557,8 @@ For more information about the governance of the Node.js project, see
 **Alex Kocharin** <alex@kocharin.ru>
 * [tellnes](https://github.com/tellnes) -
 **Christian Tellnes** <christian@tellnes.no>
+* [tunniclm](https://github.com/tunniclm) -
+**Mike Tunnicliffe** <m.j.tunnicliffe@gmail.com>
 
 Collaborators follow the [COLLABORATOR_GUIDE.md](./COLLABORATOR_GUIDE.md) in
 maintaining the Node.js project.

benchmark/events/ee-add-remove.js

@@ -2,7 +2,7 @@
 const common = require('../common.js');
 const events = require('events');
 
-const bench = common.createBenchmark(main, { n: [25e4] });
+const bench = common.createBenchmark(main, { n: [1e6] });
 
 function main({ n }) {
   const ee = new events.EventEmitter();

benchmark/fs/bench-stat-promise.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const common = require('../common');
-const fsPromises = require('fs/promises');
+const fsPromises = require('fs').promises;
 
 const bench = common.createBenchmark(main, {
   n: [20e4],

benchmark/process/next-tick-depth-args.js

@@ -8,52 +8,53 @@ const bench = common.createBenchmark(main, {
 process.maxTickDepth = Infinity;
 
 function main({ n }) {
+  let counter = n;
   function cb4(arg1, arg2, arg3, arg4) {
-    if (--n) {
-      if (n % 4 === 0)
+    if (--counter) {
+      if (counter % 4 === 0)
         process.nextTick(cb4, 3.14, 1024, true, false);
-      else if (n % 3 === 0)
+      else if (counter % 3 === 0)
         process.nextTick(cb3, 512, true, null);
-      else if (n % 2 === 0)
+      else if (counter % 2 === 0)
         process.nextTick(cb2, false, 5.1);
       else
         process.nextTick(cb1, 0);
     } else
       bench.end(n);
   }
   function cb3(arg1, arg2, arg3) {
-    if (--n) {
-      if (n % 4 === 0)
+    if (--counter) {
+      if (counter % 4 === 0)
         process.nextTick(cb4, 3.14, 1024, true, false);
-      else if (n % 3 === 0)
+      else if (counter % 3 === 0)
         process.nextTick(cb3, 512, true, null);
-      else if (n % 2 === 0)
+      else if (counter % 2 === 0)
         process.nextTick(cb2, false, 5.1);
       else
         process.nextTick(cb1, 0);
     } else
       bench.end(n);
   }
   function cb2(arg1, arg2) {
-    if (--n) {
-      if (n % 4 === 0)
+    if (--counter) {
+      if (counter % 4 === 0)
         process.nextTick(cb4, 3.14, 1024, true, false);
-      else if (n % 3 === 0)
+      else if (counter % 3 === 0)
         process.nextTick(cb3, 512, true, null);
-      else if (n % 2 === 0)
+      else if (counter % 2 === 0)
         process.nextTick(cb2, false, 5.1);
       else
         process.nextTick(cb1, 0);
     } else
       bench.end(n);
   }
   function cb1(arg1) {
-    if (--n) {
-      if (n % 4 === 0)
+    if (--counter) {
+      if (counter % 4 === 0)
         process.nextTick(cb4, 3.14, 1024, true, false);
-      else if (n % 3 === 0)
+      else if (counter % 3 === 0)
         process.nextTick(cb3, 512, true, null);
-      else if (n % 2 === 0)
+      else if (counter % 2 === 0)
         process.nextTick(cb2, false, 5.1);
       else
         process.nextTick(cb1, 0);

benchmark/process/next-tick-depth.js

@@ -7,11 +7,11 @@ const bench = common.createBenchmark(main, {
 process.maxTickDepth = Infinity;
 
 function main({ n }) {
-
+  let counter = n;
   bench.start();
   process.nextTick(onNextTick);
   function onNextTick() {
-    if (--n)
+    if (--counter)
       process.nextTick(onNextTick);
     else
       bench.end(n);

benchmark/process/next-tick-exec-args.js

@@ -5,8 +5,11 @@ const bench = common.createBenchmark(main, {
 });
 
 function main({ n }) {
+  function onNextTick(i) {
+    if (i + 1 === n)
+      bench.end(n);
+  }
 
-  bench.start();
   for (var i = 0; i < n; i++) {
     if (i % 4 === 0)
       process.nextTick(onNextTick, i, true, 10, 'test');
@@ -17,8 +20,6 @@ function main({ n }) {
     else
       process.nextTick(onNextTick, i);
   }
-  function onNextTick(i) {
-    if (i + 1 === n)
-      bench.end(n);
-  }
+
+  bench.start();
 }

benchmark/process/next-tick-exec.js

@@ -5,13 +5,14 @@ const bench = common.createBenchmark(main, {
 });
 
 function main({ n }) {
-
-  bench.start();
-  for (var i = 0; i < n; i++) {
-    process.nextTick(onNextTick, i);
-  }
   function onNextTick(i) {
     if (i + 1 === n)
       bench.end(n);
   }
+
+  for (var i = 0; i < n; i++) {
+    process.nextTick(onNextTick, i);
+  }
+
+  bench.start();
 }

benchmark/util/splice-one.js

@@ -0,0 +1,33 @@
+'use strict';
+
+const common = require('../common');
+
+const bench = common.createBenchmark(main, {
+  n: [1e7],
+  pos: ['start', 'middle', 'end'],
+  size: [10, 100, 500],
+}, { flags: ['--expose-internals'] });
+
+function main({ n, pos, size }) {
+  const { spliceOne } = require('internal/util');
+  const arr = new Array(size);
+  arr.fill('');
+  let index;
+  switch (pos) {
+    case 'end':
+      index = size - 1;
+      break;
+    case 'middle':
+      index = Math.floor(size / 2);
+      break;
+    default: // start
+      index = 0;
+  }
+
+  bench.start();
+  for (var i = 0; i < n; i++) {
+    spliceOne(arr, index);
+    arr.push('');
+  }
+  bench.end(n);
+}

deps/v8/include/v8-version.h

@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 6
 #define V8_MINOR_VERSION 6
 #define V8_BUILD_NUMBER 346
-#define V8_PATCH_LEVEL 24
+#define V8_PATCH_LEVEL 27
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)

deps/v8/src/keys.cc

@@ -77,7 +77,14 @@ void KeyAccumulator::AddKey(Handle<Object> key, AddKeyConversion convert) {
       Handle<String>::cast(key)->AsArrayIndex(&index)) {
     key = isolate_->factory()->NewNumberFromUint(index);
   }
-  keys_ = OrderedHashSet::Add(keys(), key);
+  Handle<OrderedHashSet> new_set = OrderedHashSet::Add(keys(), key);
+  if (*new_set != *keys_) {
+    // The keys_ Set is converted directly to a FixedArray in GetKeys which can
+    // be left-trimmer. Hence the previous Set should not keep a pointer to the
+    // new one.
+    keys_->set(OrderedHashTableBase::kNextTableIndex, Smi::kZero);
+    keys_ = new_set;
+  }
 }
 
 void KeyAccumulator::AddKeys(Handle<FixedArray> array,