Revert "Merge branch 'nodejs:main' into main"

This reverts commit e5d42eb, reversing
changes made to e9b71a8.

Author: MeowShe

.github/CODEOWNERS

@@ -108,7 +108,6 @@
 /benchmark/misc/startup.js @nodejs/startup
 /src/node.cc @nodejs/startup
 /src/node_native_module* @nodejs/startup
-/src/node_snapshot* @nodejs/startup
 /lib/internal/bootstrap/* @nodejs/startup
 /tools/snapshot/* @nodejs/startup
 

.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.VersionString) $(('x86', 'x64')[[Environment]::Is64BitOperatingSystem])"` in PowerShell console
+        Windows: output of `"$([Environment]::OSVersion | ForEach-Object VersionString) $(if ([Environment]::Is64BitOperatingSystem) { "x64" } else { "x86" })"` in PowerShell console
   - type: input
     attributes:
       label: Subsystem

.github/workflows/test-internet.yml

@@ -29,7 +29,6 @@ permissions:
 
 jobs:
   test-internet:
-    if: github.repository == 'nodejs/node' || github.event_name != 'schedule'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

.mailmap

@@ -287,8 +287,6 @@ Ke Ding <[email protected]>
 Keith M Wesolowski <[email protected]> <[email protected]>
 Kelsey Breseman <[email protected]>
 Kevin Millikin <[email protected]>
-Keyhan Vakil <[email protected]> <[email protected]>
-Keyhan Vakil <[email protected]> <[email protected]>
 Khaidi Chu <[email protected]>
 Khaidi Chu <[email protected]> <[email protected]>
 Kimberly Wilber <[email protected]>
@@ -431,8 +429,6 @@ Ron Korving <[email protected]> <[email protected]>
 Ruben Bridgewater <[email protected]> <[email protected]>
 Ruben Bridgewater <[email protected]> <[email protected]>
 Russell Dempsey <[email protected]> <[email protected]>
-Ruy Adorno <[email protected]> <[email protected]>
-Ruy Adorno <[email protected]> <[email protected]>
 Ryan Dahl <[email protected]>
 Ryan Emery <[email protected]>
 Ryan Mahan <[email protected]>

AUTHORS

@@ -1048,7 +1048,7 @@ Joran Siu <[email protected]>
 Vitaly Tomilov <[email protected]>
 Ratikesh Misra <[email protected]>
 Alex Perkins <[email protected]>
-Beth Griggs <bethanyngriggs@gmail.com>
+Beth Griggs <bgriggs@redhat.com>
 Joe Esposito <[email protected]>
 Erin Spiceland <[email protected]>
 Ravindra Barthwal <[email protected]>
@@ -1784,7 +1784,7 @@ Christopher Sidebottom <[email protected]>
 Edward Andrew Robinson <[email protected]>
 Shakeel Mohamed <[email protected]>
 Tobias Kieslich <[email protected]>
-Ruy Adorno <ruyadorno@google.com>
+Ruy Adorno <ruyadorno@hotmail.com>
 Stefania Sharp <[email protected]>
 Pawel Golda <[email protected]>
 Steven Scott <[email protected]>
@@ -3457,7 +3457,7 @@ Yagiz Nizipli <[email protected]>
 liuxingbaoyu <[email protected]>
 Sergey Nazaryev <[email protected]>
 William Marlow <[email protected]>
-Keyhan Vakil <[email protected]>
+Keyhan Vakil <[email protected]>
 Feng Yu <[email protected]>
 pupilTong <[email protected]>
 rikapo <[email protected]>
@@ -3490,15 +3490,5 @@ John Gee <[email protected]>
 Hrishikesh Kadam <[email protected]>
 KrayzeeKev <[email protected]>
 Airing <[email protected]>
-jiahao.si <[email protected]>
-Rhys <[email protected]>
-Mark S. Miller <[email protected]>
-Jianru Lin <[email protected]>
-Lenvin Gonsalves <[email protected]>
-Andreu Botella <[email protected]>
-shhh7612 <[email protected]>
-Dominic Saadi <[email protected]>
-ywave620 <[email protected]>
-NicoNekoru <[email protected]>
 
 # Generated by tools/update-authors.mjs

README.md

@@ -310,8 +310,6 @@ For information about the governance of the Node.js project, see
   **Daniele Belardi** <<[email protected]>> (he/him)
 * [edsadr](https://github.com/edsadr) -
   **Adrian Estrada** <<[email protected]>> (he/him)
-* [erickwendel](https://github.com/erickwendel) -
-  **Erick Wendel** <<[email protected]>> (he/him)
 * [evanlucas](https://github.com/evanlucas) -
   **Evan Lucas** <<[email protected]>> (he/him)
 * [fhinkel](https://github.com/fhinkel) -
@@ -407,7 +405,7 @@ For information about the governance of the Node.js project, see
 * [ronag](https://github.com/ronag) -
   **Robert Nagy** <<[email protected]>>
 * [ruyadorno](https://github.com/ruyadorno) -
-  **Ruy Adorno** <<ruyadorno@google.com>> (he/him)
+  **Ruy Adorno** <<ruyadorno@github.com>> (he/him)
 * [rvagg](https://github.com/rvagg) -
   **Rod Vagg** <<[email protected]>>
 * [ryzokuken](https://github.com/ryzokuken) -
@@ -426,8 +424,6 @@ For information about the governance of the Node.js project, see
   **Stewart X Addison** <<[email protected]>> (he/him)
 * [targos](https://github.com/targos) -
   **Michaël Zasso** <<[email protected]>> (he/him)
-* [theanarkh](https://github.com/theanarkh) -
-  **theanarkh** <<[email protected]>> (he/him)
 * [TimothyGu](https://github.com/TimothyGu) -
   **Tiancheng "Timothy" Gu** <<[email protected]>> (he/him)
 * [tniessen](https://github.com/tniessen) -
@@ -662,8 +658,6 @@ maintaining the Node.js project.
   **Himadri Ganguly** <<[email protected]>> (he/him)
 * [iam-frankqiu](https://github.com/iam-frankqiu) -
   **Frank Qiu** <<[email protected]>> (he/him)
-* [kvakil](https://github.com/kvakil) -
-  **Keyhan Vakil** <<[email protected]>> (they/them)
 * [marsonya](https://github.com/marsonya) -
   **Akhil Marsonya** <<[email protected]>> (he/him)
 * [meixg](https://github.com/meixg) -

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.11',
+    'v8_embedder_string': '-node.10',
 
     ##### V8 defaults for Node.js #####
 

deps/base64/base64/lib/arch/neon64/codec.c

@@ -58,13 +58,8 @@ load_64byte_table (const uint8_t *p)
 #include "../generic/32/dec_loop.c"
 #include "../generic/64/enc_loop.c"
 #include "dec_loop.c"
-
-#ifdef BASE64_NEON64_USE_ASM
-# include "enc_loop_asm.c"
-#else
-# include "enc_reshuffle.c"
-# include "enc_loop.c"
-#endif
+#include "enc_reshuffle.c"
+#include "enc_loop.c"
 
 #endif	// BASE64_USE_NEON64
 

deps/base64/base64/lib/arch/neon64/enc_loop.c

@@ -1,6 +1,72 @@
+#ifdef BASE64_NEON64_USE_ASM
+static inline void
+enc_loop_neon64_inner_asm (const uint8_t **s, uint8_t **o, const uint8x16x4_t tbl_enc)
+{
+	// This function duplicates the functionality of enc_loop_neon64_inner,
+	// but entirely with inline assembly. This gives a significant speedup
+	// over using NEON intrinsics, which do not always generate very good
+	// code. The logic of the assembly is directly lifted from the
+	// intrinsics version, so it can be used as a guide to this code.
+
+	// Temporary registers, used as scratch space.
+	uint8x16_t tmp0, tmp1, tmp2, tmp3;
+
+	// Numeric constant.
+	const uint8x16_t n63 = vdupq_n_u8(63);
+
+	__asm__ (
+
+		// Load 48 bytes and deinterleave. The bytes are loaded to
+		// hard-coded registers v12, v13 and v14, to ensure that they
+		// are contiguous. Increment the source pointer.
+		"ld3 {v12.16b, v13.16b, v14.16b}, [%[src]], #48 \n\t"
+
+		// Reshuffle the bytes using temporaries.
+		"ushr %[t0].16b, v12.16b,   #2         \n\t"
+		"ushr %[t1].16b, v13.16b,   #4         \n\t"
+		"ushr %[t2].16b, v14.16b,   #6         \n\t"
+		"sli  %[t1].16b, v12.16b,   #4         \n\t"
+		"sli  %[t2].16b, v13.16b,   #2         \n\t"
+		"and  %[t1].16b, %[t1].16b, %[n63].16b \n\t"
+		"and  %[t2].16b, %[t2].16b, %[n63].16b \n\t"
+		"and  %[t3].16b, v14.16b,   %[n63].16b \n\t"
+
+		// Translate the values to the Base64 alphabet.
+		"tbl v12.16b, {%[l0].16b, %[l1].16b, %[l2].16b, %[l3].16b}, %[t0].16b \n\t"
+		"tbl v13.16b, {%[l0].16b, %[l1].16b, %[l2].16b, %[l3].16b}, %[t1].16b \n\t"
+		"tbl v14.16b, {%[l0].16b, %[l1].16b, %[l2].16b, %[l3].16b}, %[t2].16b \n\t"
+		"tbl v15.16b, {%[l0].16b, %[l1].16b, %[l2].16b, %[l3].16b}, %[t3].16b \n\t"
+
+		// Store 64 bytes and interleave. Increment the dest pointer.
+		"st4 {v12.16b, v13.16b, v14.16b, v15.16b}, [%[dst]], #64 \n\t"
+
+		// Outputs (modified).
+		: [src] "+r"  (*s),
+		  [dst] "+r"  (*o),
+		  [t0]  "=&w" (tmp0),
+		  [t1]  "=&w" (tmp1),
+		  [t2]  "=&w" (tmp2),
+		  [t3]  "=&w" (tmp3)
+
+		// Inputs (not modified).
+		: [n63] "w" (n63),
+		  [l0]  "w" (tbl_enc.val[0]),
+		  [l1]  "w" (tbl_enc.val[1]),
+		  [l2]  "w" (tbl_enc.val[2]),
+		  [l3]  "w" (tbl_enc.val[3])
+
+		// Clobbers.
+		: "v12", "v13", "v14", "v15"
+	);
+}
+#endif
+
 static inline void
 enc_loop_neon64_inner (const uint8_t **s, uint8_t **o, const uint8x16x4_t tbl_enc)
 {
+#ifdef BASE64_NEON64_USE_ASM
+	enc_loop_neon64_inner_asm(s, o, tbl_enc);
+#else
 	// Load 48 bytes and deinterleave:
 	uint8x16x3_t src = vld3q_u8(*s);
 
@@ -20,6 +86,7 @@ enc_loop_neon64_inner (const uint8_t **s, uint8_t **o, const uint8x16x4_t tbl_en
 
 	*s += 48;
 	*o += 64;
+#endif
 }
 
 static inline void