Merge branch 'master' into read-error-destroy

Author: ronag

.github/CODEOWNERS

@@ -54,7 +54,7 @@
 # tls/crypto
 
 /lib/internal/crypto/* @nodejs/crypto
-/lib/internal/tls.js @nodejs/crypto @nodejs/net
+/lib/internal/tls/* @nodejs/crypto @nodejs/net
 /lib/crypto.js @nodejs/crypto
 /lib/tls.js @nodejs/crypto @nodejs/net
 /src/node_crypto* @nodejs/crypto

.github/workflows/find-inactive-collaborators.yml

@@ -0,0 +1,17 @@
+name: Find inactive collaborators
+
+on:
+  schedule:
+    # Run on the 15th day of the month at 4:05 AM UTC.
+    - cron: '5 4 15 * *'
+
+  workflow_dispatch:
+
+jobs:
+  find:
+  
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - run: tools/find-inactive-collaborators.mjs '1 year ago'

Makefile

@@ -204,7 +204,7 @@ check: test
 # in place
 coverage-clean:
 	$(RM) -r node_modules
-	$(RM) -r gcovr build
+	$(RM) -r gcovr
 	$(RM) -r coverage/tmp
 	$(FIND) out/$(BUILDTYPE)/obj.target \( -name "*.gcda" -o -name "*.gcno" \) \
 		-type f -exec $(RM) {} \;
@@ -220,13 +220,7 @@ coverage: coverage-test ## Run the tests and generate a coverage report.
 .PHONY: coverage-build
 coverage-build: all
 	-$(MAKE) coverage-build-js
-	if [ ! -d gcovr ]; then git clone -b 3.4 --depth=1 \
-		--single-branch https://github.com/gcovr/gcovr.git; fi
-	if [ ! -d build ]; then git clone --depth=1 \
-		--single-branch https://github.com/nodejs/build.git; fi
-	if [ ! -f gcovr/scripts/gcovr.orig ]; then \
-		(cd gcovr && patch -N -p1 < \
-		"$(CURDIR)/build/jenkins/scripts/coverage/gcovr-patches-3.4.diff"); fi
+	if [ ! -d gcovr ]; then $(PYTHON) -m pip install -t gcovr gcovr==4.2; fi
 	$(MAKE)
 
 .PHONY: coverage-build-js
@@ -238,16 +232,14 @@ coverage-build-js:
 
 .PHONY: coverage-test
 coverage-test: coverage-build
-	$(RM) out/$(BUILDTYPE)/obj.target/node/src/*.gcda
-	$(RM) out/$(BUILDTYPE)/obj.target/node/src/*/*.gcda
-	$(RM) out/$(BUILDTYPE)/obj.target/node_lib/src/*.gcda
-	$(RM) out/$(BUILDTYPE)/obj.target/node_lib/src/*/*.gcda
+	$(FIND) out/$(BUILDTYPE)/obj.target -name "*.gcda" -type f -exec $(RM) {} \;
 	-NODE_V8_COVERAGE=coverage/tmp \
 		TEST_CI_ARGS="$(TEST_CI_ARGS) --type=coverage" $(MAKE) $(COVTESTS)
 	$(MAKE) coverage-report-js
-	-(cd out && "../gcovr/scripts/gcovr" \
+	-(cd out && PYTHONPATH=../gcovr $(PYTHON) -m gcovr \
 		--gcov-exclude='.*\b(deps|usr|out|cctest|embedding)\b' -v \
-		-r Release/obj.target --html --html-detail -o ../coverage/cxxcoverage.html \
+		-r ../src/ --object-directory Release/obj.target \
+		--html --html-details -o ../coverage/cxxcoverage.html \
 		--gcov-executable="$(GCOV)")
 	@printf "Javascript coverage %%: "
 	@grep -B1 Lines coverage/index.html | head -n1 \
@@ -847,6 +839,9 @@ else
 ifeq ($(findstring powerpc,$(shell uname -p)),powerpc)
 DESTCPU ?= ppc64
 else
+ifeq ($(findstring riscv64,$(UNAME_M)),riscv64)
+DESTCPU ?= riscv64
+else
 DESTCPU ?= x86
 endif
 endif
@@ -857,6 +852,7 @@ endif
 endif
 endif
 endif
+endif
 ifeq ($(DESTCPU),x64)
 ARCH=x64
 else
@@ -878,6 +874,9 @@ else
 ifeq ($(DESTCPU),s390x)
 ARCH=s390x
 else
+ifeq ($(DESTCPU),riscv64)
+ARCH=riscv64
+else
 ARCH=x86
 endif
 endif
@@ -886,6 +885,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.
@@ -1093,7 +1093,7 @@ $(TARBALL): release-only doc-only
 	find $(TARNAME)/deps/v8/test -type f ! -regex '.*/test/torque/.*' | xargs $(RM)
 	find $(TARNAME)/deps/zlib/contrib/* -type d ! -regex '.*/contrib/optimizations$$' | xargs $(RM) -r
 	find $(TARNAME)/ -name ".eslint*" -maxdepth 2 | xargs $(RM)
-	find $(TARNAME)/ -type l | xargs $(RM) # annoying on windows
+	find $(TARNAME)/ -type l | xargs $(RM)
 	tar -cf $(TARNAME).tar $(TARNAME)
 	$(RM) -r $(TARNAME)
 	gzip -c -f -9 $(TARNAME).tar > $(TARNAME).tar.gz

README.md

@@ -200,6 +200,10 @@ For information about the governance of the Node.js project, see
 * [Trott](https://github.com/Trott) -
 **Rich Trott** <[email protected]> (he/him)
 
+<details>
+
+<summary>Emeriti</summary>
+
 ### TSC emeriti
 
 * [addaleax](https://github.com/addaleax) -
@@ -243,6 +247,8 @@ For information about the governance of the Node.js project, see
 * [trevnorris](https://github.com/trevnorris) -
 **Trevor Norris** &lt;[email protected]&gt;
 
+</details>
+
 ### Collaborators
 
 * [addaleax](https://github.com/addaleax) -
@@ -458,6 +464,10 @@ For information about the governance of the Node.js project, see
 * [ZYSzys](https://github.com/ZYSzys) -
 **Yongsheng Zhang** &lt;[email protected]&gt; (he/him)
 
+<details>
+
+<summary>Emeriti</summary>
+
 ### Collaborator emeriti
 
 * [andrasq](https://github.com/andrasq) -
@@ -592,6 +602,8 @@ For information about the governance of the Node.js project, see
 **Vse Mozhet Byt** &lt;[email protected]&gt; (he/him)
 * [whitlockjc](https://github.com/whitlockjc) -
 **Jeremy Whitlock** &lt;[email protected]&gt;
+
+</details>
 <!--lint enable prohibited-strings-->
 
 Collaborators follow the [Collaborator Guide](./doc/guides/collaborator-guide.md) in
@@ -655,7 +667,9 @@ gpg --keyserver pool.sks-keyservers.net --recv-keys B9E2F5981AA6E0CD28160D9FF139
 See the section above on [Verifying Binaries](#verifying-binaries) for how to
 use these keys to verify a downloaded file.
 
-Other keys used to sign some previous releases:
+<details>
+
+<summary>Other keys used to sign some previous releases</summary>
 
 * **Chris Dickinson** &lt;[email protected]&gt;
 `9554F04D7259F04124DE6B476D5A82AC7E37093B`
@@ -676,6 +690,8 @@ Other keys used to sign some previous releases:
 * **Timothy J Fontaine** &lt;[email protected]&gt;
 `7937DFD2AB06298B2293C3187D33FF9D0246406D`
 
+</details>
+
 ## License
 
 Node.js is available under the

common.gypi

@@ -36,7 +36,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.13',
+    'v8_embedder_string': '-node.20',
 
     ##### V8 defaults for Node.js #####
 

configure.py

@@ -1066,6 +1066,7 @@ def host_arch_cc():
     '__PPC__'     : 'ppc64',
     '__x86_64__'  : 'x64',
     '__s390x__'   : 's390x',
+    '__riscv'     : 'riscv',
   }
 
   rtn = 'ia32' # default
@@ -1078,6 +1079,12 @@ def host_arch_cc():
   if rtn == 'mipsel' and '_LP64' in k:
     rtn = 'mips64el'
 
+  if rtn == 'riscv':
+    if k['__riscv_xlen'] == '64':
+      rtn = 'riscv64'
+    else:
+      rtn = 'riscv32'
+
   return rtn
 
 

deps/v8/include/v8-version.h

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

deps/v8/src/heap/heap.cc

@@ -2129,6 +2129,10 @@ void Heap::CompleteSweepingYoung(GarbageCollector collector) {
   array_buffer_sweeper()->EnsureFinished();
 }
 
+void Heap::EnsureSweepingCompleted() {
+  mark_compact_collector()->EnsureSweepingCompleted();
+}
+
 void Heap::UpdateCurrentEpoch(GarbageCollector collector) {
   if (IsYoungGenerationCollector(collector)) {
     epoch_young_ = next_epoch();

deps/v8/src/heap/heap.h

@@ -1074,6 +1074,8 @@ class Heap {
   void CompleteSweepingFull();
   void CompleteSweepingYoung(GarbageCollector collector);
 
+  void EnsureSweepingCompleted();
+
   IncrementalMarking* incremental_marking() {
     return incremental_marking_.get();
   }

deps/v8/src/json/json-parser.cc

@@ -620,6 +620,11 @@ Handle<Object> JsonParser<Char>::BuildJsonObject(
         DCHECK_EQ(mutable_double_address, end);
       }
 #endif
+      // Before setting the length of mutable_double_buffer back to zero, we
+      // must ensure that the sweeper is not running or has already swept the
+      // object's page. Otherwise the GC can add the contents of
+      // mutable_double_buffer to the free list.
+      isolate()->heap()->EnsureSweepingCompleted();
       mutable_double_buffer->set_length(0);
     }
   }