nodejs · BridgeAR · Aug 6, 2019 · Jul 21, 2019 · Jun 20, 2019 · Jul 22, 2019
diff --git a/.gitignore b/.gitignore
@@ -131,3 +131,4 @@ _UpgradeReport_Files/
 *.pyc
 __pycache__
 .DS_Store
+*~
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,7 +28,8 @@ release.
 </tr>
 <tr>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V12.md#12.7.0">12.7.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V12.md#12.8.0">12.8.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V12.md#12.7.0">12.7.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V12.md#12.6.0">12.6.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V12.md#12.5.0">12.5.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V12.md#12.4.0">12.4.0</a><br/>

diff --git a/Makefile b/Makefile
@@ -19,24 +19,24 @@ PWD = $(CURDIR)
 BUILD_WITH ?= make
 
 ifdef JOBS
-  PARALLEL_ARGS = -j $(JOBS)
+	PARALLEL_ARGS = -j $(JOBS)
 else
-  PARALLEL_ARGS = -J
+	PARALLEL_ARGS = -J
 endif
 
 ifdef ENABLE_V8_TAP
-  TAP_V8 := --junitout $(PWD)/v8-tap.xml
-  TAP_V8_INTL := --junitout $(PWD)/v8-intl-tap.xml
-  TAP_V8_BENCHMARKS := --junitout $(PWD)/v8-benchmarks-tap.xml
+	TAP_V8 := --junitout $(PWD)/v8-tap.xml
+	TAP_V8_INTL := --junitout $(PWD)/v8-intl-tap.xml
+	TAP_V8_BENCHMARKS := --junitout $(PWD)/v8-benchmarks-tap.xml
 endif
 
 V8_TEST_OPTIONS = $(V8_EXTRA_TEST_OPTIONS)
 ifdef DISABLE_V8_I18N
-  V8_BUILD_OPTIONS += i18nsupport=off
+	V8_BUILD_OPTIONS += i18nsupport=off
 endif
 
 ifeq ($(OSTYPE), darwin)
-  GCOV = xcrun llvm-cov gcov
+	GCOV = xcrun llvm-cov gcov
 endif
 
 BUILDTYPE_LOWER := $(shell echo $(BUILDTYPE) | tr '[A-Z]' '[a-z]')
@@ -62,7 +62,7 @@ V ?= 0
 # Use -e to double check in case it's a broken link
 # Use $(PWD) so we can cd to anywhere before calling this
 available-node = \
-  if [ -x $(PWD)/$(NODE) ] && [ -e $(PWD)/$(NODE) ]; then \
+	if [ -x $(PWD)/$(NODE) ] && [ -e $(PWD)/$(NODE) ]; then \
 		$(PWD)/$(NODE) $(1); \
 	elif [ -x `which node` ] && [ -e `which node` ] && [ `which node` ]; then \
 		`which node` $(1); \
@@ -107,12 +107,12 @@ $(NODE_G_EXE): config.gypi out/Makefile
 else
 ifeq ($(BUILD_WITH), ninja)
 ifeq ($(V),1)
-  NINJA_ARGS := $(NINJA_ARGS) -v
+	NINJA_ARGS := $(NINJA_ARGS) -v
 endif
 ifdef JOBS
-  NINJA_ARGS := $(NINJA_ARGS) -j$(JOBS)
+	NINJA_ARGS := $(NINJA_ARGS) -j$(JOBS)
 else
-  NINJA_ARGS := $(NINJA_ARGS) $(filter -j%,$(MAKEFLAGS))
+	NINJA_ARGS := $(NINJA_ARGS) $(filter -j%,$(MAKEFLAGS))
 endif
 $(NODE_EXE): config.gypi out/Release/build.ninja
 	ninja -C out/Release $(NINJA_ARGS)
@@ -141,9 +141,9 @@ test-code-cache: with-code-cache
 	echo "'test-code-cache' target is a noop"
 
 out/Makefile: config.gypi common.gypi node.gyp \
-  deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \
-  tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
-  tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
+	deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \
+	tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
+	tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
 	$(PYTHON) tools/gyp_node.py -f make
 
 config.gypi: configure configure.py
@@ -243,7 +243,7 @@ coverage-test: coverage-build
 	$(RM) out/$(BUILDTYPE)/obj.target/node_lib/src/*.gcda
 	$(RM) out/$(BUILDTYPE)/obj.target/node_lib/src/tracing/*.gcda
 	-NODE_V8_COVERAGE=out/$(BUILDTYPE)/.coverage \
-                TEST_CI_ARGS="$(TEST_CI_ARGS) --type=coverage" $(MAKE) $(COVTESTS)
+								TEST_CI_ARGS="$(TEST_CI_ARGS) --type=coverage" $(MAKE) $(COVTESTS)
 	$(MAKE) coverage-report-js
 	-(cd out && "../gcovr/scripts/gcovr" --gcov-exclude='.*deps' \
 		--gcov-exclude='.*usr' -v -r Release/obj.target \
@@ -261,7 +261,7 @@ COV_REPORT_OPTIONS = --reporter=html \
 	--resolve=./lib --exclude="benchmark/" --exclude="deps/" --exclude="test/" --exclude="tools/" \
 	--wrapper-length=0
 ifdef COV_ENFORCE_THRESHOLD
-  COV_REPORT_OPTIONS += --check-coverage --lines=$(COV_ENFORCE_THRESHOLD)
+	COV_REPORT_OPTIONS += --check-coverage --lines=$(COV_ENFORCE_THRESHOLD)
 endif
 
 .PHONY: coverage-report-js
@@ -299,7 +299,7 @@ coverage-run-js:
 	$(RM) -r out/$(BUILDTYPE)/.coverage
 	$(MAKE) coverage-build-js
 	-NODE_V8_COVERAGE=out/$(BUILDTYPE)/.coverage CI_SKIP_TESTS=$(COV_SKIP_TESTS) \
-	        TEST_CI_ARGS="$(TEST_CI_ARGS) --type=coverage" $(MAKE) jstest
+					TEST_CI_ARGS="$(TEST_CI_ARGS) --type=coverage" $(MAKE) jstest
 	$(MAKE) coverage-report-js
 
 .PHONY: test
@@ -362,7 +362,7 @@ DOCBUILDSTAMP_PREREQS := $(DOCBUILDSTAMP_PREREQS) out/$(BUILDTYPE)/node.exp
 endif
 
 node_use_openssl = $(call available-node,"-p" \
-		   "process.versions.openssl != undefined")
+			 "process.versions.openssl != undefined")
 test/addons/.docbuildstamp: $(DOCBUILDSTAMP_PREREQS) tools/doc/node_modules
 	@if [ "$(shell $(node_use_openssl))" != "true" ]; then \
 		echo "Skipping .docbuildstamp (no crypto)"; \
@@ -387,9 +387,9 @@ ADDONS_PREREQS := config.gypi \
 
 define run_build_addons
 env npm_config_loglevel=$(LOGLEVEL) npm_config_nodedir="$$PWD" \
-  npm_config_python="$(PYTHON)" $(NODE) "$$PWD/tools/build-addons" \
-  "$$PWD/deps/npm/node_modules/node-gyp/bin/node-gyp.js" \
-  $1
+	npm_config_python="$(PYTHON)" $(NODE) "$$PWD/tools/build-addons" \
+	"$$PWD/deps/npm/node_modules/node-gyp/bin/node-gyp.js" \
+	$1
 touch $2
 endef
 
@@ -489,9 +489,9 @@ test-all-suites: | clear-stalled test-build bench-addons-build doc-only ## Run a
 CI_NATIVE_SUITES ?= addons js-native-api node-api
 CI_JS_SUITES ?= default
 ifeq ($(node_use_openssl), false)
-  CI_DOC := doctool
+	CI_DOC := doctool
 else
-  CI_DOC =
+	CI_DOC =
 endif
 
 .PHONY: test-ci-native
@@ -659,21 +659,21 @@ ifneq ("","$(wildcard deps/v8/tools/run-tests.py)")
 # Related CI job: node-test-commit-v8-linux
 test-v8: v8  ## Runs the V8 test suite on deps/v8.
 	deps/v8/tools/run-tests.py --gn --arch=$(V8_ARCH) \
-        --mode=$(BUILDTYPE_LOWER) $(V8_TEST_OPTIONS) \
+				--mode=$(BUILDTYPE_LOWER) $(V8_TEST_OPTIONS) \
 				mjsunit cctest debugger inspector message preparser \
-	      $(TAP_V8)
+				$(TAP_V8)
 	@echo Testing hash seed
 	$(MAKE) test-hash-seed
 
 test-v8-intl: v8
 	deps/v8/tools/run-tests.py --gn --arch=$(V8_ARCH) \
-        --mode=$(BUILDTYPE_LOWER) intl \
-        $(TAP_V8_INTL)
+				--mode=$(BUILDTYPE_LOWER) intl \
+				$(TAP_V8_INTL)
 
 test-v8-benchmarks: v8
 	deps/v8/tools/run-tests.py --gn --arch=$(V8_ARCH) --mode=$(BUILDTYPE_LOWER) \
-        benchmarks \
-	      $(TAP_V8_BENCHMARKS)
+				benchmarks \
+				$(TAP_V8_BENCHMARKS)
 
 test-v8-updates:
 	$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) v8-updates
@@ -806,6 +806,9 @@ UNAME_M=$(shell uname -m)
 ifeq ($(findstring x86_64,$(UNAME_M)),x86_64)
 DESTCPU ?= x64
 else
+ifeq ($(findstring amd64,$(UNAME_M)),amd64)
+DESTCPU ?= x64
+else
 ifeq ($(findstring ppc64,$(UNAME_M)),ppc64)
 DESTCPU ?= ppc64
 else
@@ -865,6 +868,7 @@ endif
 endif
 endif
 endif
+endif
 
 # node and v8 use different arch names (e.g. node 'x86' vs v8 'ia32').
 # pass the proper v8 arch name to $V8_ARCH based on user-specified $DESTCPU.
@@ -1181,8 +1185,8 @@ tools/.docmdlintstamp: $(LINT_MD_DOC_FILES)
 LINT_MD_TARGETS = src lib benchmark test tools/doc tools/icu
 LINT_MD_ROOT_DOCS := $(wildcard *.md)
 LINT_MD_MISC_FILES := $(shell find $(LINT_MD_TARGETS) -type f \
-  ! -path '*node_modules*' ! -path 'test/fixtures/*' -name '*.md') \
-  $(LINT_MD_ROOT_DOCS)
+	! -path '*node_modules*' ! -path 'test/fixtures/*' -name '*.md') \
+	$(LINT_MD_ROOT_DOCS)
 run-lint-misc-md = tools/lint-md.js -q -f $(LINT_MD_MISC_FILES)
 # Lint other changed markdown files maintained by us
 tools/.miscmdlintstamp: $(LINT_MD_MISC_FILES)
@@ -1298,9 +1302,9 @@ else
 endif
 
 ifeq ($(V),1)
-  CPPLINT_QUIET =
+	CPPLINT_QUIET =
 else
-  CPPLINT_QUIET = --quiet
+	CPPLINT_QUIET = --quiet
 endif
 .PHONY: lint-cpp
 # Lints the C++ code with cpplint.py and check-imports.py.

diff --git a/benchmark/buffers/buffer-base64-decode-wrapped.js b/benchmark/buffers/buffer-base64-decode-wrapped.js
@@ -18,7 +18,7 @@ function main({ charsPerLine, linesCount, n }) {
   const buffer = Buffer.alloc(bytesCount, line, 'base64');
 
   bench.start();
-  for (var i = 0; i < n; i++) {
+  for (let i = 0; i < n; i++) {
     buffer.base64Write(data, 0, bytesCount);
   }
   bench.end(n);

diff --git a/benchmark/buffers/buffer-base64-decode.js b/benchmark/buffers/buffer-base64-decode.js
@@ -16,6 +16,6 @@ function main({ n, size }) {
   const b = Buffer.allocUnsafe(encodedSize);
   b.write(s, 0, encodedSize, 'base64');
   bench.start();
-  for (var i = 0; i < n; i += 1) b.base64Write(s, 0, s.length);
+  for (let i = 0; i < n; i += 1) b.base64Write(s, 0, s.length);
   bench.end(n);
 }
diff --git a/benchmark/buffers/buffer-bytelength.js b/benchmark/buffers/buffer-bytelength.js
@@ -37,7 +37,7 @@ function main({ n, len, encoding }) {
   }
 
   bench.start();
-  for (var i = 0; i < n; i++) {
+  for (let i = 0; i < n; i++) {
     const index = n % strings.length;
     // Go!
     const r = Buffer.byteLength(strings[index], encoding);

diff --git a/benchmark/buffers/buffer-compare-offset.js b/benchmark/buffers/buffer-compare-offset.js
@@ -8,12 +8,12 @@ const bench = common.createBenchmark(main, {
 });
 
 function compareUsingSlice(b0, b1, len, iter) {
-  for (var i = 0; i < iter; i++)
+  for (let i = 0; i < iter; i++)
     Buffer.compare(b0.slice(1, len), b1.slice(1, len));
 }
 
 function compareUsingOffset(b0, b1, len, iter) {
-  for (var i = 0; i < iter; i++)
+  for (let i = 0; i < iter; i++)
     b0.compare(b1, 1, len, 1, len);
 }
 

diff --git a/benchmark/buffers/buffer-compare.js b/benchmark/buffers/buffer-compare.js
@@ -34,7 +34,7 @@ function main({ n, size }) {
   b1[size - 1] = 'b'.charCodeAt(0);
 
   bench.start();
-  for (var i = 0; i < n; i++) {
+  for (let i = 0; i < n; i++) {
     Buffer.compare(b0, b1);
   }
   bench.end(n);

diff --git a/benchmark/buffers/buffer-concat.js b/benchmark/buffers/buffer-concat.js
@@ -15,7 +15,7 @@ function main({ n, pieces, pieceSize, withTotalLength }) {
   const totalLength = withTotalLength ? pieces * pieceSize : undefined;
 
   bench.start();
-  for (var i = 0; i < n; i++) {
+  for (let i = 0; i < n; i++) {
     Buffer.concat(list, totalLength);
   }
   bench.end(n);

diff --git a/benchmark/buffers/buffer-indexof-number.js b/benchmark/buffers/buffer-indexof-number.js
@@ -15,7 +15,7 @@ function main({ n, value }) {
 
   let count = 0;
   bench.start();
-  for (var i = 0; i < n; i++) {
+  for (let i = 0; i < n; i++) {
     count += aliceBuffer.indexOf(value, 0, undefined);
   }
   bench.end(n);

diff --git a/benchmark/buffers/buffer-indexof.js b/benchmark/buffers/buffer-indexof.js
@@ -42,7 +42,7 @@ function main({ n, search, encoding, type }) {
   }
 
   bench.start();
-  for (var i = 0; i < n; i++) {
+  for (let i = 0; i < n; i++) {
     aliceBuffer.indexOf(search, 0, encoding);
   }
   bench.end(n);

diff --git a/benchmark/buffers/buffer-normalize-encoding.js b/benchmark/buffers/buffer-normalize-encoding.js
@@ -31,7 +31,7 @@ function main({ encoding, n }) {
   const { normalizeEncoding } = require('internal/util');
 
   bench.start();
-  for (var i = 0; i < n; i++) {
+  for (let i = 0; i < n; i++) {
     normalizeEncoding(encoding);
   }
   bench.end(n);

diff --git a/benchmark/buffers/buffer-read-float.js b/benchmark/buffers/buffer-read-float.js
@@ -32,7 +32,7 @@ function main({ n, type, endian, value }) {
   buff[`write${type}${endian}`](values[type][value], 0);
 
   bench.start();
-  for (var i = 0; i !== n; i++) {
+  for (let i = 0; i !== n; i++) {
     buff[fn](0);
   }
   bench.end(n);

diff --git a/benchmark/buffers/buffer-read-with-byteLength.js b/benchmark/buffers/buffer-read-with-byteLength.js
@@ -23,7 +23,7 @@ function main({ n, buf, type, byteLength }) {
 
   buff.writeDoubleLE(0, 0);
   bench.start();
-  for (var i = 0; i !== n; i++) {
+  for (let i = 0; i !== n; i++) {
     buff[fn](0, byteLength);
   }
   bench.end(n);

diff --git a/benchmark/buffers/buffer-read.js b/benchmark/buffers/buffer-read.js
@@ -33,7 +33,7 @@ function main({ n, buf, type }) {
   buff.writeDoubleLE(0, 0);
   bench.start();
 
-  for (var i = 0; i !== n; i++) {
+  for (let i = 0; i !== n; i++) {
     buff[fn](0);
   }
   bench.end(n);

diff --git a/benchmark/buffers/buffer-slice.js b/benchmark/buffers/buffer-slice.js
@@ -13,7 +13,7 @@ const slowBuf = new SlowBuffer(1024);
 function main({ n, type }) {
   const b = type === 'fast' ? buf : slowBuf;
   bench.start();
-  for (var i = 0; i < n; i++) {
+  for (let i = 0; i < n; i++) {
     b.slice(10, 256);
   }
   bench.end(n);

diff --git a/benchmark/buffers/buffer-swap.js b/benchmark/buffers/buffer-swap.js
@@ -27,7 +27,7 @@ function swap(b, n, m) {
 Buffer.prototype.htons = function htons() {
   if (this.length % 2 !== 0)
     throw new RangeError();
-  for (var i = 0; i < this.length; i += 2) {
+  for (let i = 0; i < this.length; i += 2) {
     swap(this, i, i + 1);
   }
   return this;
@@ -46,7 +46,7 @@ Buffer.prototype.htonl = function htonl() {
 Buffer.prototype.htonll = function htonll() {
   if (this.length % 8 !== 0)
     throw new RangeError();
-  for (var i = 0; i < this.length; i += 8) {
+  for (let i = 0; i < this.length; i += 8) {
     swap(this, i, i + 7);
     swap(this, i + 1, i + 6);
     swap(this, i + 2, i + 5);
@@ -58,7 +58,7 @@ Buffer.prototype.htonll = function htonll() {
 function createBuffer(len, aligned) {
   len += aligned ? 0 : 1;
   const buf = Buffer.allocUnsafe(len);
-  for (var i = 1; i <= len; i++)
+  for (let i = 1; i <= len; i++)
     buf[i - 1] = i;
   return aligned ? buf : buf.slice(1);
 }

diff --git a/benchmark/buffers/buffer-tojson.js b/benchmark/buffers/buffer-tojson.js
@@ -11,7 +11,7 @@ function main({ n, len }) {
   const buf = Buffer.allocUnsafe(len);
 
   bench.start();
-  for (var i = 0; i < n; ++i)
+  for (let i = 0; i < n; ++i)
     buf.toJSON();
   bench.end(n);
 }