v8.3.0 proposal

CHANGELOG.md

@@ -27,7 +27,8 @@ release.
 </tr>
 <tr>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V8.md#8.2.1">8.2.1</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V8.md#8.3.0">8.3.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V8.md#8.2.1">8.2.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V8.md#8.2.0">8.2.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V8.md#8.1.4">8.1.4</a><br/>
 <a href="doc/changelogs/CHANGELOG_V8.md#8.1.3">8.1.3</a><br/>

Makefile

@@ -702,7 +702,8 @@ $(PKG): release-only
 		--release-urlbase=$(RELEASE_URLBASE) \
 		$(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS)
 	$(MAKE) install V=$(V) DESTDIR=$(PKGDIR)
-	SIGN="$(CODESIGN_CERT)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh
+	SIGN="$(CODESIGN_CERT)" PKGDIR="$(PKGDIR)/usr/local" bash \
+		tools/osx-codesign.sh
 	cat tools/osx-pkg.pmdoc/index.xml.tmpl \
 		| sed -E "s/\\{nodeversion\\}/$(FULLVERSION)/g" \
 		| sed -E "s/\\{npmversion\\}/$(NPMVERSION)/g" \
@@ -807,6 +808,9 @@ $(BINARYTAR): release-only
 	cp README.md $(BINARYNAME)
 	cp LICENSE $(BINARYNAME)
 	cp CHANGELOG.md $(BINARYNAME)
+ifeq ($(OSTYPE),darwin)
+	SIGN="$(CODESIGN_CERT)" PKGDIR="$(BINARYNAME)" bash tools/osx-codesign.sh
+endif
 	tar -cf $(BINARYNAME).tar $(BINARYNAME)
 	$(RM) -r $(BINARYNAME)
 	gzip -c -f -9 $(BINARYNAME).tar > $(BINARYNAME).tar.gz

README.md

@@ -448,6 +448,8 @@ more information about the governance of the Node.js project, see
 **Daijiro Wachi** <daijiro.wachi@gmail.com> (he/him)
 * [whitlockjc](https://github.com/whitlockjc) -
 **Jeremy Whitlock** <jwhitlock@apache.org>
+* [XadillaX](https://github.com/XadillaX) -
+**Khaidi Chu** <i@2333.moe> (he/him)
 * [yorkie](https://github.com/yorkie) -
 **Yorkie Liu** <yorkiefixer@gmail.com>
 * [yosuke-furukawa](https://github.com/yosuke-furukawa) -

benchmark/assert/deepequal-map.js

@@ -0,0 +1,123 @@
+'use strict';
+
+/* eslint-disable no-restricted-properties */
+
+const common = require('../common.js');
+const assert = require('assert');
+
+const bench = common.createBenchmark(main, {
+  n: [5e2],
+  len: [5e2],
+  method: [
+    'deepEqual_primitiveOnly',
+    'deepStrictEqual_primitiveOnly',
+    'deepEqual_objectOnly',
+    'deepStrictEqual_objectOnly',
+    'deepEqual_mixed',
+    'deepStrictEqual_mixed',
+    'deepEqual_looseMatches',
+    'notDeepEqual_primitiveOnly',
+    'notDeepStrictEqual_primitiveOnly',
+    'notDeepEqual_objectOnly',
+    'notDeepStrictEqual_objectOnly',
+    'notDeepEqual_mixed',
+    'notDeepStrictEqual_mixed',
+    'notDeepEqual_looseMatches',
+  ]
+});
+
+function benchmark(method, n, values, values2) {
+  const actual = new Map(values);
+  // Prevent reference equal elements
+  const deepCopy = JSON.parse(JSON.stringify(values2 ? values2 : values));
+  const expected = new Map(deepCopy);
+  bench.start();
+  for (var i = 0; i < n; ++i) {
+    method(actual, expected);
+  }
+  bench.end(n);
+}
+
+function main(conf) {
+  const n = +conf.n;
+  const len = +conf.len;
+
+  const array = Array(len).fill(1);
+  var values, values2;
+
+  switch (conf.method) {
+    case 'deepEqual_primitiveOnly':
+      values = array.map((_, i) => [`str_${i}`, 123]);
+      benchmark(assert.deepEqual, n, values);
+      break;
+    case 'deepStrictEqual_primitiveOnly':
+      values = array.map((_, i) => [`str_${i}`, 123]);
+      benchmark(assert.deepStrictEqual, n, values);
+      break;
+    case 'deepEqual_objectOnly':
+      values = array.map((_, i) => [[`str_${i}`, 1], 123]);
+      benchmark(assert.deepEqual, n, values);
+      break;
+    case 'deepStrictEqual_objectOnly':
+      values = array.map((_, i) => [[`str_${i}`, 1], 123]);
+      benchmark(assert.deepStrictEqual, n, values);
+      break;
+    case 'deepEqual_mixed':
+      values = array.map((_, i) => [i % 2 ? [`str_${i}`, 1] : `str_${i}`, 123]);
+      benchmark(assert.deepEqual, n, values);
+      break;
+    case 'deepStrictEqual_mixed':
+      values = array.map((_, i) => [i % 2 ? [`str_${i}`, 1] : `str_${i}`, 123]);
+      benchmark(assert.deepStrictEqual, n, values);
+      break;
+    case 'deepEqual_looseMatches':
+      values = array.map((_, i) => [i, i]);
+      values2 = values.slice().map((v) => [String(v[0]), String(v[1])]);
+      benchmark(assert.deepEqual, n, values, values2);
+      break;
+    case 'notDeepEqual_primitiveOnly':
+      values = array.map((_, i) => [`str_${i}`, 123]);
+      values2 = values.slice(0);
+      values2[Math.floor(len / 2)] = ['w00t', 123];
+      benchmark(assert.notDeepEqual, n, values, values2);
+      break;
+    case 'notDeepStrictEqual_primitiveOnly':
+      values = array.map((_, i) => [`str_${i}`, 123]);
+      values2 = values.slice(0);
+      values2[Math.floor(len / 2)] = ['w00t', 123];
+      benchmark(assert.notDeepStrictEqual, n, values, values2);
+      break;
+    case 'notDeepEqual_objectOnly':
+      values = array.map((_, i) => [[`str_${i}`, 1], 123]);
+      values2 = values.slice(0);
+      values2[Math.floor(len / 2)] = [['w00t'], 123];
+      benchmark(assert.notDeepEqual, n, values, values2);
+      break;
+    case 'notDeepStrictEqual_objectOnly':
+      values = array.map((_, i) => [[`str_${i}`, 1], 123]);
+      values2 = values.slice(0);
+      values2[Math.floor(len / 2)] = [['w00t'], 123];
+      benchmark(assert.notDeepStrictEqual, n, values, values2);
+      break;
+    case 'notDeepEqual_mixed':
+      values = array.map((_, i) => [i % 2 ? [`str_${i}`, 1] : `str_${i}`, 123]);
+      values2 = values.slice(0);
+      values2[0] = ['w00t', 123];
+      benchmark(assert.notDeepEqual, n, values, values2);
+      break;
+    case 'notDeepStrictEqual_mixed':
+      values = array.map((_, i) => [i % 2 ? [`str_${i}`, 1] : `str_${i}`, 123]);
+      values2 = values.slice(0);
+      values2[0] = ['w00t', 123];
+      benchmark(assert.notDeepStrictEqual, n, values, values2);
+      break;
+    case 'notDeepEqual_looseMatches':
+      values = array.map((_, i) => [i, i]);
+      values2 = values.slice().map((v) => [String(v[0]), String(v[1])]);
+      values2[len - 1] = [String(len + 1), String(len + 1)];
+      benchmark(assert.notDeepEqual, n, values, values2);
+      break;
+    default:
+      throw new Error('Unsupported method');
+  }
+}

benchmark/assert/deepequal-set.js

@@ -0,0 +1,132 @@
+'use strict';
+
+/* eslint-disable no-restricted-properties */
+
+const common = require('../common.js');
+const assert = require('assert');
+
+const bench = common.createBenchmark(main, {
+  n: [5e2],
+  len: [5e2],
+  method: [
+    'deepEqual_primitiveOnly',
+    'deepStrictEqual_primitiveOnly',
+    'deepEqual_objectOnly',
+    'deepStrictEqual_objectOnly',
+    'deepEqual_mixed',
+    'deepStrictEqual_mixed',
+    'deepEqual_looseMatches',
+    'notDeepEqual_primitiveOnly',
+    'notDeepStrictEqual_primitiveOnly',
+    'notDeepEqual_objectOnly',
+    'notDeepStrictEqual_objectOnly',
+    'notDeepEqual_mixed',
+    'notDeepStrictEqual_mixed',
+    'notDeepEqual_looseMatches',
+  ]
+});
+
+function benchmark(method, n, values, values2) {
+  const actual = new Set(values);
+  // Prevent reference equal elements
+  const deepCopy = JSON.parse(JSON.stringify(values2 ? values2 : values));
+  const expected = new Set(deepCopy);
+  bench.start();
+  for (var i = 0; i < n; ++i) {
+    method(actual, expected);
+  }
+  bench.end(n);
+}
+
+function main(conf) {
+  const n = +conf.n;
+  const len = +conf.len;
+
+  const array = Array(len).fill(1);
+
+  var values, values2;
+
+  switch (conf.method) {
+    case 'deepEqual_primitiveOnly':
+      values = array.map((_, i) => `str_${i}`);
+      benchmark(assert.deepEqual, n, values);
+      break;
+    case 'deepStrictEqual_primitiveOnly':
+      values = array.map((_, i) => `str_${i}`);
+      benchmark(assert.deepStrictEqual, n, values);
+      break;
+    case 'deepEqual_objectOnly':
+      values = array.map((_, i) => [`str_${i}`, null]);
+      benchmark(assert.deepEqual, n, values);
+      break;
+    case 'deepStrictEqual_objectOnly':
+      values = array.map((_, i) => [`str_${i}`, null]);
+      benchmark(assert.deepStrictEqual, n, values);
+      break;
+    case 'deepEqual_mixed':
+      values = array.map((_, i) => {
+        return i % 2 ? [`str_${i}`, null] : `str_${i}`;
+      });
+      benchmark(assert.deepEqual, n, values);
+      break;
+    case 'deepStrictEqual_mixed':
+      values = array.map((_, i) => {
+        return i % 2 ? [`str_${i}`, null] : `str_${i}`;
+      });
+      benchmark(assert.deepStrictEqual, n, values);
+      break;
+    case 'deepEqual_looseMatches':
+      values = array.map((_, i) => i);
+      values2 = values.slice().map((v) => String(v));
+      benchmark(assert.deepEqual, n, values, values2);
+      break;
+    case 'notDeepEqual_primitiveOnly':
+      values = array.map((_, i) => `str_${i}`);
+      values2 = values.slice(0);
+      values2[Math.floor(len / 2)] = 'w00t';
+      benchmark(assert.notDeepEqual, n, values, values2);
+      break;
+    case 'notDeepStrictEqual_primitiveOnly':
+      values = array.map((_, i) => `str_${i}`);
+      values2 = values.slice(0);
+      values2[Math.floor(len / 2)] = 'w00t';
+      benchmark(assert.notDeepStrictEqual, n, values, values2);
+      break;
+    case 'notDeepEqual_objectOnly':
+      values = array.map((_, i) => [`str_${i}`, null]);
+      values2 = values.slice(0);
+      values2[Math.floor(len / 2)] = ['w00t'];
+      benchmark(assert.notDeepEqual, n, values, values2);
+      break;
+    case 'notDeepStrictEqual_objectOnly':
+      values = array.map((_, i) => [`str_${i}`, null]);
+      values2 = values.slice(0);
+      values2[Math.floor(len / 2)] = ['w00t'];
+      benchmark(assert.notDeepStrictEqual, n, values, values2);
+      break;
+    case 'notDeepEqual_mixed':
+      values = array.map((_, i) => {
+        return i % 2 ? [`str_${i}`, null] : `str_${i}`;
+      });
+      values2 = values.slice();
+      values2[0] = 'w00t';
+      benchmark(assert.notDeepEqual, n, values, values2);
+      break;
+    case 'notDeepStrictEqual_mixed':
+      values = array.map((_, i) => {
+        return i % 2 ? [`str_${i}`, null] : `str_${i}`;
+      });
+      values2 = values.slice();
+      values2[0] = 'w00t';
+      benchmark(assert.notDeepStrictEqual, n, values, values2);
+      break;
+    case 'notDeepEqual_looseMatches':
+      values = array.map((_, i) => i);
+      values2 = values.slice().map((v) => String(v));
+      values2[len - 1] = String(len + 1);
+      benchmark(assert.notDeepEqual, n, values, values2);
+      break;
+    default:
+      throw new Error('Unsupported method');
+  }
+}

common.gypi

@@ -407,9 +407,15 @@
         'libraries': [ '-lelf' ],
       }],
       ['OS=="freebsd"', {
-        # Use this flag because on FreeBSD std::pairs copy constructor is non-trivial
-        # https://lists.freebsd.org/pipermail/freebsd-toolchain/2016-March/002094.html
-        'cflags': [ '-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1' ],
+        'conditions': [
+          ['llvm_version < "4.0"', {
+            # Use this flag because on FreeBSD std::pairs copy constructor is non-trivial.
+            # Doesn't apply to llvm 4.0 (FreeBSD 11.1) or later.
+            # Refs: https://lists.freebsd.org/pipermail/freebsd-toolchain/2016-March/002094.html
+            # Refs: https://svnweb.freebsd.org/ports/head/www/node/Makefile?revision=444555&view=markup
+            'cflags': [ '-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1' ],
+          }],
+        ],
         'ldflags': [
           '-Wl,--export-dynamic',
         ],

configure

@@ -640,12 +640,14 @@ def check_compiler(o):
     # to a version that is not completely ancient.
     warn('C compiler too old, need gcc 4.2 or clang 3.2 (CC=%s)' % CC)
 
-  # Need llvm_version or gas_version when openssl asm files are compiled
+  if is_clang:
+    o['variables']['llvm_version'] = get_llvm_version(CC)
+
+  # Need xcode_version or gas_version when openssl asm files are compiled.
   if options.without_ssl or options.openssl_no_asm or options.shared_openssl:
     return
 
   if is_clang:
-    o['variables']['llvm_version'] = get_llvm_version(CC)
     if sys.platform == 'darwin':
       o['variables']['xcode_version'] = get_xcode_version(CC)
   else:

deps/cares/src/ares_parse_naptr_reply.c

@@ -110,18 +110,19 @@ ares_parse_naptr_reply (const unsigned char *abuf, int alen,
           status = ARES_EBADRESP;
           break;
         }
-      /* RR must contain at least 7 bytes = 2 x int16 + 3 x name */
-      if (rr_len < 7)
-        {
-          status = ARES_EBADRESP;
-          break;
-        }
 
       /* Check if we are really looking at a NAPTR record */
       if (rr_class == C_IN && rr_type == T_NAPTR)
         {
           /* parse the NAPTR record itself */
 
+          /* RR must contain at least 7 bytes = 2 x int16 + 3 x name */
+          if (rr_len < 7)
+            {
+              status = ARES_EBADRESP;
+              break;
+            }
+
           /* Allocate storage for this NAPTR answer appending it to the list */
           naptr_curr = ares_malloc_data(ARES_DATATYPE_NAPTR_REPLY);
           if (!naptr_curr)