Merge branch 'nodejs:master' into esm/build-addon

nodejs · May 15, 2022 · dc8593a · dc8593a
2 parents 4ea0c86 + 347000c
commit dc8593a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -32,7 +32,7 @@ jobs:
     if: github.event.pull_request.draft == false
     strategy:
       matrix:
-        windows: [windows-2019, windows-2022]
+        windows: [windows-2019]
       fail-fast: false
     runs-on: ${{ matrix.windows }}
     steps:

diff --git a/.github/workflows/coverage-windows.yml b/.github/workflows/coverage-windows.yml
@@ -33,7 +33,7 @@ env:
 jobs:
   coverage-windows:
     if: github.event.pull_request.draft == false
-    runs-on: windows-latest
+    runs-on: windows-2019
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/.github/workflows/test-asan.yml b/.github/workflows/test-asan.yml
@@ -30,6 +30,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
+  ASAN_OPTIONS: intercept_tls_get_addr=0
   PYTHON_VERSION: '3.10'
   FLAKY_TESTS: dontcare
 

diff --git a/.mailmap b/.mailmap
@@ -198,8 +198,6 @@ Hassaan Pasha <[email protected]> <[email protected]>
 Hendrik Schwalm <[email protected]>
 Henry Chin <[email protected]>
 Herbert Vojčík <[email protected]>
-Zeyu "Alex" Yang <[email protected]> <[email protected]>
-Zeyu "Alex" Yang <[email protected]> <[email protected]>
 Hitesh Kanwathirtha <[email protected]> <[email protected]>
 Icer Liang <[email protected]> <[email protected]>
 Igor Savin <[email protected]>
@@ -382,6 +380,7 @@ Oluwaseun Omoyajowo <[email protected]>
 OneNail <[email protected]> <[email protected]>
 Onne Gorter <[email protected]>
 Oscar Martinez <[email protected]> <[email protected]>
+Paolo Insogna <[email protected]>
 Paul Graham <[email protected]> <[email protected]>
 Paul Querna <[email protected]> <[email protected]>
 Pedro Lima <[email protected]>
@@ -564,6 +563,8 @@ Yuta Hiroto <[email protected]>
 Zach Bjornson <[email protected]> <[email protected]>
 Zachary Scott <[email protected]> <[email protected]>
 Zachary Vacura <[email protected]>
+Zeyu "Alex" Yang <[email protected]> <[email protected]>
+Zeyu "Alex" Yang <[email protected]> <[email protected]>
 Zoran Tomicic <[email protected]>
 Сковорода Никита Андреевич <[email protected]>
 隋鑫磊 <[email protected]>
diff --git a/doc/api/modules.md b/doc/api/modules.md
@@ -562,7 +562,7 @@ wrapper that looks like the following:
 
 By doing this, Node.js achieves a few things:
 
-* It keeps top-level variables (defined with `var`, `const` or `let`) scoped to
+* It keeps top-level variables (defined with `var`, `const`, or `let`) scoped to
   the module rather than the global object.
 * It helps to provide some global-looking variables that are actually specific
   to the module, such as:

diff --git a/lib/internal/fs/promises.js b/lib/internal/fs/promises.js
@@ -528,7 +528,7 @@ async function read(handle, bufferOrParams, offset, length, position) {
       offset = 0,
       length = buffer.byteLength - offset,
       position = null
-    } = offset ?? ObjectCreate(null));
+    } = offset);
   }
 
   if (offset == null) {