nodejs · danielleadams · Jun 27, 2022 · Jul 26, 2022 · Jul 26, 2022 · Jul 26, 2022
diff --git a/.eslintignore b/.eslintignore
@@ -6,6 +6,7 @@ test/message/esm_display_syntax_error.mjs
 tools/icu
 tools/lint-md/lint-md.mjs
 benchmark/tmp
+benchmark/fixtures
 doc/**/*.js
 !doc/api_assets/*.js
 !.eslintrc.js
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -107,7 +107,8 @@
 
 /benchmark/misc/startup.js @nodejs/startup
 /src/node.cc @nodejs/startup
-/src/node_native_module* @nodejs/startup
+/src/node_builtins* @nodejs/startup
+/src/node_snapshot* @nodejs/startup
 /lib/internal/bootstrap/* @nodejs/startup
 /tools/snapshot/* @nodejs/startup
 

diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.yml b/.github/ISSUE_TEMPLATE/1-bug-report.yml
@@ -19,7 +19,7 @@ body:
       label: Platform
       description: |
         UNIX: output of `uname -a`
-        Windows: output of `"$([Environment]::OSVersion | ForEach-Object VersionString) $(if ([Environment]::Is64BitOperatingSystem) { "x64" } else { "x86" })"` in PowerShell console
+        Windows: output of `"$([Environment]::OSVersion.VersionString) $(('x86', 'x64')[[Environment]::Is64BitOperatingSystem])"` in PowerShell console
   - type: input
     attributes:
       label: Subsystem

diff --git a/.github/workflows/label-flaky-test-issue.yml b/.github/workflows/label-flaky-test-issue.yml
@@ -0,0 +1,50 @@
+name: Label Flaky Test Issues
+
+on:
+  issues:
+    types: [opened, labeled]
+
+jobs:
+  label:
+    if: github.event.label.name == 'flaky-test'
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - name: Extract labels
+        id: extract-labels
+        env:
+          BODY: ${{ github.event.issue.body }}
+        run: |
+          BODY="${BODY//$'\n'/'\n'}"
+
+          declare -A platform2label
+
+          platform2label["AIX"]="aix";
+          platform2label["FreeBSD"]="freebsd";
+          platform2label["Linux ARM64"]="linux";
+          platform2label["Linux ARMv7"]="arm";
+          platform2label["Linux PPC64LE"]="ppc";
+          platform2label["Linux s390x"]="s390";
+          platform2label["Linux x64"]="linux";
+          platform2label["macOS ARM64"]="macos";
+          platform2label["macOS x64"]="macos";
+          platform2label["SmartOS"]="smartos";
+          platform2label["Windows"]="windows";
+
+          # sed is cleaning up the edges
+          PLATFORMS=$(echo $BODY | sed 's/^.*Platform\\n\\n//' | sed 's/\(, Other\)\?\\n\\n.*$//') 2> /dev/null
+          readarray -d , -t list <<< "$PLATFORMS"
+          labels=
+          for row in "${list[@]}"; do \
+            platform=$(echo $row | xargs); \
+            labels="${labels}${platform2label[$platform]},"; \
+          done;
+
+          echo "::set-output name=LABELS::${labels::-1}"
+
+      - name: Add labels
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NUMBER: ${{ github.event.issue.number }}
+        run: gh issue edit "$NUMBER" --repo ${{ github.repository }} --add-label "${{ steps.extract-labels.outputs.LABELS }}"
diff --git a/.github/workflows/test-internet.yml b/.github/workflows/test-internet.yml
@@ -29,6 +29,7 @@ permissions:
 
 jobs:
   test-internet:
+    if: github.repository == 'nodejs/node' || github.event_name != 'schedule'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

diff --git a/.mailmap b/.mailmap
@@ -287,6 +287,8 @@ Ke Ding <dingkework@hotmail.com>
 Keith M Wesolowski <wesolows@joyent.com> <wesolows@foobazco.org>
 Kelsey Breseman <ifoundthemeaningoflife@gmail.com>
 Kevin Millikin <kmillikin@chromium.org>
+Keyhan Vakil <kvakil@sylph.kvakil.me> <60900335+airtable-keyhanvakil@users.noreply.github.com>
+Keyhan Vakil <kvakil@sylph.kvakil.me> <kvakil@github.kvakil.me>
 Khaidi Chu <i@2333.moe>
 Khaidi Chu <i@2333.moe> <admin@xcoder.in>
 Kimberly Wilber <gcr@sneakygcr.net>
@@ -429,6 +431,8 @@ Ron Korving <ron@ronkorving.nl> <rkorving@wizcorp.jp>
 Ruben Bridgewater <ruben@bridgewater.de> <ruben.bridgewater@fintura.de>
 Ruben Bridgewater <ruben@bridgewater.de> <ruben.bridgewater@maibornwolff.de>
 Russell Dempsey <sgtpooki@gmail.com> <SgtPooki@gmail.com>
+Ruy Adorno <ruyadorno@google.com> <ruyadorno@github.com>
+Ruy Adorno <ruyadorno@google.com> <ruyadorno@hotmail.com>
 Ryan Dahl <ry@tinyclouds.org>
 Ryan Emery <seebees@gmail.com>
 Ryan Mahan <ryanmahan97@gmail.com>

diff --git a/AUTHORS b/AUTHORS
@@ -1048,7 +1048,7 @@ Joran Siu <joransiu@ca.ibm.com>
 Vitaly Tomilov <vitaly-t@users.noreply.github.com>
 Ratikesh Misra <ratikesh92@gmail.com>
 Alex Perkins <aperkin@rei.com>
-Beth Griggs <bgriggs@redhat.com>
+Beth Griggs <bethanyngriggs@gmail.com>
 Joe Esposito <joe@joeyespo.com>
 Erin Spiceland <yes@erin.codes>
 Ravindra Barthwal <ravindrabarthwal@users.noreply.github.com>
@@ -1784,7 +1784,7 @@ Christopher Sidebottom <chris@damouse.co.uk>
 Edward Andrew Robinson <earobinson@gmail.com>
 Shakeel Mohamed <contact@shakeel.xyz>
 Tobias Kieslich <tobias.kieslich@gmail.com>
-Ruy Adorno <ruyadorno@hotmail.com>
+Ruy Adorno <ruyadorno@google.com>
 Stefania Sharp <stefaniasharp@gmail.com>
 Pawel Golda <pawelgolda@gmail.com>
 Steven Scott <Contact@TheDgtl.net>
@@ -3457,7 +3457,7 @@ Yagiz Nizipli <yagiz@nizipli.com>
 liuxingbaoyu <30521560+liuxingbaoyu@users.noreply.github.com>
 Sergey Nazaryev <sergey@nazaryev.com>
 William Marlow <william.marlow@ibm.com>
-Keyhan Vakil <60900335+airtable-keyhanvakil@users.noreply.github.com>
+Keyhan Vakil <kvakil@sylph.kvakil.me>
 Feng Yu <F3n67u@outlook.com>
 pupilTong <pupiltong@outlook.com>
 rikapo <rikaporori@gmail.com>
@@ -3490,5 +3490,22 @@ John Gee <john@ruru.gen.nz>
 Hrishikesh Kadam <hrkadam.92@gmail.com>
 KrayzeeKev <github@lentinfamily.com>
 Airing <airing@ursb.me>
+jiahao.si <sijiahao0839@gmail.com>
+Rhys <Anemy@users.noreply.github.com>
+Mark S. Miller <erights@users.noreply.github.com>
+Jianru Lin <jianru.lin@gmail.com>
+Lenvin Gonsalves <41874033+98lenvi@users.noreply.github.com>
+Andreu Botella <andreu@andreubotella.com>
+shhh7612 <82669765+shhh7612@users.noreply.github.com>
+Dominic Saadi <dominiceliassaadi@gmail.com>
+ywave620 <60539365+ywave620@users.noreply.github.com>
+NicoNekoru <66227158+NicoNekoru@users.noreply.github.com>
+SADIK KUZU <sadikkuzu@hotmail.com>
+flakey5 <73616808+flakey5@users.noreply.github.com>
+Saurabh Daware <saurabhdaware99@gmail.com>
+BuShe <bushe.cn@icloud.com>
+Nick Sia <31839263+nicksia-vgw@users.noreply.github.com>
+Basit Chonka <baasit121@icloud.com>
+Jeremiah Gowdy <jgowdy@godaddy.com>
 
 # Generated by tools/update-authors.mjs
diff --git a/BUILDING.md b/BUILDING.md
@@ -37,7 +37,7 @@ file a new issue.
       * [Option 1: Manual install](#option-1-manual-install)
       * [Option 2: Automated install with Boxstarter](#option-2-automated-install-with-boxstarter)
     * [Building Node.js](#building-nodejs-2)
-  * [Android/Android-based devices (e.g. Firefox OS)](#androidandroid-based-devices-eg-firefox-os)
+  * [Android](#android)
 * [`Intl` (ECMA-402) support](#intl-ecma-402-support)
   * [Build with full ICU support (all locales supported by ICU)](#build-with-full-icu-support-all-locales-supported-by-icu)
     * [Unix/macOS](#unixmacos)
@@ -647,22 +647,25 @@ To test if Node.js was built correctly:
 > Release\node -e "console.log('Hello from Node.js', process.version)"
 ```
 
-### Android/Android-based devices (e.g. Firefox OS)
+### Android
 
 Android is not a supported platform. Patches to improve the Android build are
 welcome. There is no testing on Android in the current continuous integration
 environment. The participation of people dedicated and determined to improve
 Android building, testing, and support is encouraged.
 
 Be sure you have downloaded and extracted
-[Android NDK](https://developer.android.com/tools/sdk/ndk/index.html) before in
+[Android NDK](https://developer.android.com/ndk) before in
 a folder. Then run:
 
 ```console
-$ ./android-configure /path/to/your/android-ndk
-$ make
+$ source ./android-configure /path/to/your/android-ndk target_arch android_sdk_version
+$ make -j4
 ```
 
+The Android SDK version should be at least 24 (Android 7.0) and the target
+architecture supports \[arm, arm64/aarch64, x86, x86\_64].
+
 ## `Intl` (ECMA-402) support
 
 [Intl](https://github.com/nodejs/node/blob/HEAD/doc/api/intl.md) support is

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,7 +35,8 @@ release.
 </tr>
 <tr>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V18.md#18.7.0">18.7.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V18.md#18.8.0">18.8.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V18.md#18.7.0">18.7.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V18.md#18.6.0">18.6.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V18.md#18.5.0">18.5.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V18.md#18.4.0">18.4.0</a><br/>

diff --git a/README.md b/README.md
@@ -310,6 +310,8 @@ For information about the governance of the Node.js project, see
   **Daniele Belardi** <<dwon.dnl@gmail.com>> (he/him)
 * [edsadr](https://github.com/edsadr) -
   **Adrian Estrada** <<edsadr@gmail.com>> (he/him)
+* [erickwendel](https://github.com/erickwendel) -
+  **Erick Wendel** <<erick.workspace@gmail.com>> (he/him)
 * [evanlucas](https://github.com/evanlucas) -
   **Evan Lucas** <<evanlucas@me.com>> (he/him)
 * [fhinkel](https://github.com/fhinkel) -
@@ -380,6 +382,8 @@ For information about the governance of the Node.js project, see
   **Milad Fa** <<mfarazma@redhat.com>> (he/him)
 * [mildsunrise](https://github.com/mildsunrise) -
   **Alba Mendez** <<me@alba.sh>> (she/her)
+* [MoLow](https://github.com/MoLow) -
+  **Moshe Atlow** <<moshe@atlow.co.il>> (he/him)
 * [mscdex](https://github.com/mscdex) -
   **Brian White** <<mscdex@mscdex.net>>
 * [MylesBorins](https://github.com/MylesBorins) -
@@ -405,7 +409,7 @@ For information about the governance of the Node.js project, see
 * [ronag](https://github.com/ronag) -
   **Robert Nagy** <<ronagy@icloud.com>>
 * [ruyadorno](https://github.com/ruyadorno) -
-  **Ruy Adorno** <<ruyadorno@github.com>> (he/him)
+  **Ruy Adorno** <<ruyadorno@google.com>> (he/him)
 * [rvagg](https://github.com/rvagg) -
   **Rod Vagg** <<rod@vagg.org>>
 * [ryzokuken](https://github.com/ryzokuken) -
@@ -424,6 +428,8 @@ For information about the governance of the Node.js project, see
   **Stewart X Addison** <<sxa@redhat.com>> (he/him)
 * [targos](https://github.com/targos) -
   **Michaël Zasso** <<targos@protonmail.com>> (he/him)
+* [theanarkh](https://github.com/theanarkh) -
+  **theanarkh** <<theratliter@gmail.com>> (he/him)
 * [TimothyGu](https://github.com/TimothyGu) -
   **Tiancheng "Timothy" Gu** <<timothygu99@gmail.com>> (he/him)
 * [tniessen](https://github.com/tniessen) -
@@ -658,6 +664,8 @@ maintaining the Node.js project.
   **Himadri Ganguly** <<himadri.tech@gmail.com>> (he/him)
 * [iam-frankqiu](https://github.com/iam-frankqiu) -
   **Frank Qiu** <<iam.frankqiu@gmail.com>> (he/him)
+* [kvakil](https://github.com/kvakil) -
+  **Keyhan Vakil** <<kvakil@sylph.kvakil.me>> (they/them)
 * [marsonya](https://github.com/marsonya) -
   **Akhil Marsonya** <<akhil.marsonya27@gmail.com>> (he/him)
 * [meixg](https://github.com/meixg) -

diff --git a/android-configure b/android-configure
@@ -17,16 +17,14 @@ NDK_PATH=$1
 ARCH="$2"
 ANDROID_SDK_VERSION=$3
 
-if [ $ANDROID_SDK_VERSION -lt 23 ]; then
-  echo "$ANDROID_SDK_VERSION should equal or later than 23(Android 6.0)"
+if [ $ANDROID_SDK_VERSION -lt 24 ]; then
+  echo "$ANDROID_SDK_VERSION should equal or later than 24 (Android 7.0)"
 fi
 
-CC_VER="4.9"
-
 case $ARCH in
     arm)
         DEST_CPU="arm"
-        TOOLCHAIN_NAME="armv7-linux-androideabi"
+        TOOLCHAIN_NAME="armv7a-linux-androideabi"
         ;;
     x86)
         DEST_CPU="ia32"

diff --git a/benchmark/es/error-stack.js b/benchmark/es/error-stack.js
@@ -0,0 +1,34 @@
+'use strict';
+
+const common = require('../common.js');
+const modPath = require.resolve('../fixtures/simple-error-stack.js');
+
+const bench = common.createBenchmark(main, {
+  method: ['without-sourcemap', 'sourcemap'],
+  n: [1e5],
+});
+
+function runN(n) {
+  delete require.cache[modPath];
+  const mod = require(modPath);
+  bench.start();
+  for (let i = 0; i < n; i++) {
+    mod.simpleErrorStack();
+  }
+  bench.end(n);
+}
+
+function main({ n, method }) {
+  switch (method) {
+    case 'without-sourcemap':
+      process.setSourceMapsEnabled(false);
+      runN(n);
+      break;
+    case 'sourcemap':
+      process.setSourceMapsEnabled(true);
+      runN(n);
+      break;
+    default:
+      throw new Error(`Unexpected method "${method}"`);
+  }
+}
diff --git a/benchmark/fixtures/simple-error-stack.js b/benchmark/fixtures/simple-error-stack.js
diff --git a/benchmark/fixtures/simple-error-stack.ts b/benchmark/fixtures/simple-error-stack.ts
@@ -0,0 +1,17 @@
+'use strict';
+
+// Compile with `tsc --inlineSourceMap benchmark/fixtures/simple-error-stack.ts`.
+
+const lorem = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.';
+
+function simpleErrorStack() {
+  try {
+    (lorem as any).BANG();
+  } catch (e) {
+    return e.stack;
+  }
+}
+
+export {
+  simpleErrorStack,
+};
diff --git a/common.gypi b/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.9',
+    'v8_embedder_string': '-node.11',
 
     ##### V8 defaults for Node.js #####
 

diff --git a/configure.py b/configure.py
@@ -1237,6 +1237,10 @@ def configure_node(o):
 
   o['variables']['want_separate_host_toolset'] = int(cross_compiling)
 
+  # Enable branch protection for arm64
+  if target_arch == 'arm64':
+    o['cflags']+=['-msign-return-address=all']
+
   if options.node_snapshot_main is not None:
     if options.shared:
       # This should be possible to fix, but we will need to refactor the

diff --git a/deps/base64/base64/lib/arch/neon64/codec.c b/deps/base64/base64/lib/arch/neon64/codec.c
@@ -58,8 +58,13 @@ load_64byte_table (const uint8_t *p)
 #include "../generic/32/dec_loop.c"
 #include "../generic/64/enc_loop.c"
 #include "dec_loop.c"
-#include "enc_reshuffle.c"
-#include "enc_loop.c"
+
+#ifdef BASE64_NEON64_USE_ASM
+# include "enc_loop_asm.c"
+#else
+# include "enc_reshuffle.c"
+# include "enc_loop.c"
+#endif
 
 #endif	// BASE64_USE_NEON64