Skip to content

Commit de497ad

Browse files
committed
Merge remote-tracking branch 'upstream/main' into source-maps/vm
2 parents ed255d5 + bae14b7 commit de497ad

File tree

158 files changed

+6996
-1842
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+6996
-1842
lines changed

.github/workflows/test-ubsan.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- AUTHORS
1010
- doc/**
1111
- .github/**
12-
- '!.github/workflows/ubsan-asan.yml'
12+
- '!.github/workflows/test-ubsan.yml'
1313
push:
1414
branches:
1515
- main
@@ -22,7 +22,7 @@ on:
2222
- AUTHORS
2323
- doc/**
2424
- .github/**
25-
- '!.github/workflows/ubsan-asan.yml'
25+
- '!.github/workflows/test-ubsan.yml'
2626

2727
concurrency:
2828
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -45,19 +45,19 @@ jobs:
4545
LINK: g++
4646
CONFIG_FLAGS: --enable-ubsan
4747
steps:
48-
- uses: actions/checkout@v3
48+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4949
with:
5050
persist-credentials: false
5151
- name: Store suppressions path
5252
run: |
5353
echo "UBSAN_OPTIONS=suppressions=$GITHUB_WORKSPACE/suppressions.supp" >> $GITHUB_ENV
5454
- name: Set up Python ${{ env.PYTHON_VERSION }}
55-
uses: actions/setup-python@v4
55+
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
5656
with:
5757
python-version: ${{ env.PYTHON_VERSION }}
5858
- name: Environment Information
5959
run: npx envinfo
6060
- name: Build
6161
run: make build-ci -j2 V=1
6262
- name: Test
63-
run: make run-ci -j2 V=1 TEST_CI_ARGS="-p actions -t 300 --measure-flakiness 9"
63+
run: make run-ci -j2 V=1 TEST_CI_ARGS="-p actions --node-args='--test-reporter=spec' --node-args='--test-reporter-destination=stdout' -t 300 --measure-flakiness 9"

benchmark/misc/startup-core.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const bench = common.createBenchmark(main, {
99
script: [
1010
'benchmark/fixtures/require-builtins',
1111
'test/fixtures/semicolon',
12+
'test/fixtures/snapshot/typescript',
1213
],
1314
mode: ['process', 'worker'],
1415
count: [30],
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
'use strict';
2+
const common = require('../common.js');
3+
const { Readable } = require('stream');
4+
5+
const bench = common.createBenchmark(main, {
6+
n: [1e6],
7+
kind: ['read', 'encoding'],
8+
});
9+
const ABC = new Uint8Array([0x41, 0x42, 0x43]);
10+
11+
function main({ n, kind }) {
12+
switch (kind) {
13+
case 'read': {
14+
bench.start();
15+
const readable = new Readable({
16+
read() {},
17+
});
18+
for (let i = 0; i < n; ++i) readable.push(ABC);
19+
bench.end(n);
20+
break;
21+
}
22+
23+
case 'encoding': {
24+
bench.start();
25+
const readable = new Readable({
26+
read() {},
27+
});
28+
readable.setEncoding('utf8');
29+
for (let i = 0; i < n; ++i) readable.push(ABC);
30+
bench.end(n);
31+
break;
32+
}
33+
default:
34+
throw new Error('Invalid kind');
35+
}
36+
}
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
'use strict';
2+
const common = require('../common.js');
3+
const { Writable } = require('stream');
4+
5+
const bench = common.createBenchmark(main, {
6+
n: [50e6],
7+
kind: ['write', 'object-mode', 'writev'],
8+
});
9+
const ABC = new Uint8Array([0x41, 0x42, 0x43]);
10+
11+
function main({ n, kind }) {
12+
switch (kind) {
13+
case 'write': {
14+
bench.start();
15+
const wr = new Writable({
16+
write(chunk, encoding, cb) {
17+
cb();
18+
},
19+
});
20+
for (let i = 0; i < n; ++i) wr.write(ABC);
21+
bench.end(n);
22+
break;
23+
}
24+
25+
case 'object-mode': {
26+
bench.start();
27+
const wr = new Writable({
28+
objectMode: true,
29+
write(chunk, encoding, cb) {
30+
cb();
31+
},
32+
});
33+
for (let i = 0; i < n; ++i) wr.write(ABC);
34+
bench.end(n);
35+
break;
36+
}
37+
case 'writev': {
38+
bench.start();
39+
const wr = new Writable({
40+
writev(chunks, cb) {
41+
cb();
42+
},
43+
});
44+
for (let i = 0; i < n; ++i) wr.write(ABC);
45+
bench.end(n);
46+
break;
47+
}
48+
default:
49+
throw new Error('Invalid kind');
50+
}
51+
}

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
# Reset this number to 0 on major V8 upgrades.
3939
# Increment by one for each non-official patch applied to deps/v8.
40-
'v8_embedder_string': '-node.13',
40+
'v8_embedder_string': '-node.15',
4141

4242
##### V8 defaults for Node.js #####
4343

deps/simdutf/simdutf.cpp

Lines changed: 4342 additions & 190 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)