Skip to content

Commit e33a53c

Browse files
Merge pull request #1026 from nodejs/main
Create a new pull request by comparing changes across two branches
2 parents 96789c1 + 54b5ec9 commit e33a53c

File tree

152 files changed

+1014
-669
lines changed

Some content is hidden

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

152 files changed

+1014
-669
lines changed

.github/workflows/notify-on-review-wanted.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111
jobs:
1212
notifyOnReviewWanted:
1313
name: Notify on Review Wanted
14-
if: github.repository == 'nodejs/node' && github.event.label == 'review wanted'
14+
if: github.repository == 'nodejs/node' && github.event.label.name == 'review wanted'
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Determine PR or Issue

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,6 @@ For information about the governance of the Node.js project, see
362362
**James M Snell** <<[email protected]>> (he/him)
363363
* [jkrems](https://github.com/jkrems) -
364364
**Jan Krems** <<[email protected]>> (he/him)
365-
* [joesepi](https://github.com/joesepi) -
366-
**Joe Sepi** <<[email protected]>> (he/him)
367365
* [joyeecheung](https://github.com/joyeecheung) -
368366
**Joyee Cheung** <<[email protected]>> (she/her)
369367
* [juanarbol](https://github.com/juanarbol) -
@@ -566,6 +564,8 @@ For information about the governance of the Node.js project, see
566564
**Yuval Brik** <<[email protected]>>
567565
* [joaocgreis](https://github.com/joaocgreis) -
568566
**João Reis** <<[email protected]>>
567+
* [joesepi](https://github.com/joesepi) -
568+
**Joe Sepi** <<[email protected]>> (he/him)
569569
* [joshgav](https://github.com/joshgav) -
570570
**Josh Gavant** <<[email protected]>>
571571
* [julianduque](https://github.com/julianduque) -

benchmark/_http-benchmarkers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class TestDoubleBenchmarker {
110110
}
111111

112112
create(options) {
113-
process.env.duration = process.env.duration || options.duration || 5;
113+
process.env.duration ||= options.duration || 5;
114114

115115
const scheme = options.scheme || 'http';
116116
const env = {

benchmark/common.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ class Benchmark {
113113
}
114114
const [, key, value] = match;
115115
if (configs[key] !== undefined) {
116-
if (!cliOptions[key])
117-
cliOptions[key] = [];
116+
cliOptions[key] ||= [];
118117
cliOptions[key].push(
119118
// Infer the type from the config object and parse accordingly
120119
typeof configs[key][0] === 'number' ? +value : value,
@@ -177,10 +176,9 @@ class Benchmark {
177176

178177
http(options, cb) {
179178
const http_options = { ...options };
180-
http_options.benchmarker = http_options.benchmarker ||
181-
this.config.benchmarker ||
182-
this.extra_options.benchmarker ||
183-
http_benchmarkers.default_http_benchmarker;
179+
http_options.benchmarker ||= this.config.benchmarker ||
180+
this.extra_options.benchmarker ||
181+
http_benchmarkers.default_http_benchmarker;
184182
http_benchmarkers.run(
185183
http_options, (error, code, used_benchmarker, result, elapsed) => {
186184
if (cb) {

benchmark/es/defaultparams-bench.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ const bench = common.createBenchmark(main, {
99
});
1010

1111
function oldStyleDefaults(x, y) {
12-
x = x || 1;
13-
y = y || 2;
12+
x ||= 1;
13+
y ||= 2;
1414
assert.strictEqual(x, 1);
1515
assert.strictEqual(y, 2);
1616
}

benchmark/perf_hooks/resourcetiming.js

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,12 @@ function createTimingInfo({
2121
finalConnectionTimingInfo = null,
2222
}) {
2323
if (finalConnectionTimingInfo !== null) {
24-
finalConnectionTimingInfo.domainLookupStartTime =
25-
finalConnectionTimingInfo.domainLookupStartTime || 0;
26-
finalConnectionTimingInfo.domainLookupEndTime =
27-
finalConnectionTimingInfo.domainLookupEndTime || 0;
28-
finalConnectionTimingInfo.connectionStartTime =
29-
finalConnectionTimingInfo.connectionStartTime || 0;
30-
finalConnectionTimingInfo.connectionEndTime =
31-
finalConnectionTimingInfo.connectionEndTime || 0;
32-
finalConnectionTimingInfo.secureConnectionStartTime =
33-
finalConnectionTimingInfo.secureConnectionStartTime || 0;
34-
finalConnectionTimingInfo.ALPNNegotiatedProtocol =
35-
finalConnectionTimingInfo.ALPNNegotiatedProtocol || [];
24+
finalConnectionTimingInfo.domainLookupStartTime ||= 0;
25+
finalConnectionTimingInfo.domainLookupEndTime ||= 0;
26+
finalConnectionTimingInfo.connectionStartTime ||= 0;
27+
finalConnectionTimingInfo.connectionEndTime ||= 0;
28+
finalConnectionTimingInfo.secureConnectionStartTime ||= 0;
29+
finalConnectionTimingInfo.ALPNNegotiatedProtocol ||= [];
3630
}
3731
return {
3832
startTime,

benchmark/zlib/deflate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const bench = common.createBenchmark(main, {
1010

1111
function main({ n, method, inputLen }) {
1212
// Default method value for testing.
13-
method = method || 'deflate';
13+
method ||= 'deflate';
1414
const chunk = Buffer.alloc(inputLen, 'a');
1515

1616
switch (method) {

benchmark/zlib/inflate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const bench = common.createBenchmark(main, {
1010

1111
function main({ n, method, inputLen }) {
1212
// Default method value for tests.
13-
method = method || 'inflate';
13+
method ||= 'inflate';
1414
const chunk = zlib.deflateSync(Buffer.alloc(inputLen, 'a'));
1515

1616
let i = 0;

deps/v8/include/v8-version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define V8_MAJOR_VERSION 12
1212
#define V8_MINOR_VERSION 9
1313
#define V8_BUILD_NUMBER 202
14-
#define V8_PATCH_LEVEL 19
14+
#define V8_PATCH_LEVEL 26
1515

1616
// Use 1 for candidates and 0 otherwise.
1717
// (Boolean macro values are not supported by all preprocessors.)

deps/v8/src/flags/flag-definitions.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -566,8 +566,8 @@ DEFINE_BOOL(maglev_inlining, true,
566566
"enable inlining in the maglev optimizing compiler")
567567
DEFINE_BOOL(maglev_loop_peeling, true,
568568
"enable loop peeling in the maglev optimizing compiler")
569-
DEFINE_BOOL(maglev_optimistic_peeled_loops, true,
570-
"enable aggressive optimizations for loops (loop SPeeling) in the "
569+
DEFINE_BOOL(maglev_optimistic_peeled_loops, false,
570+
"enable speculation on loop state using peeling as fallback in the "
571571
"maglev optimizing compiler")
572572
DEFINE_INT(maglev_loop_peeling_max_size, 200,
573573
"max loop size for loop peeling in the maglev optimizing compiler")
@@ -582,6 +582,7 @@ DEFINE_BOOL(maglev_destroy_on_background, true,
582582
DEFINE_BOOL(maglev_inline_api_calls, false,
583583
"Inline CallApiCallback builtin into generated code")
584584
DEFINE_EXPERIMENTAL_FEATURE(maglev_licm, "loop invariant code motion")
585+
DEFINE_WEAK_IMPLICATION(maglev_future, maglev_optimistic_peeled_loops)
585586
DEFINE_WEAK_IMPLICATION(maglev_future, maglev_speculative_hoist_phi_untagging)
586587
DEFINE_WEAK_IMPLICATION(maglev_future, maglev_inline_api_calls)
587588
DEFINE_WEAK_IMPLICATION(maglev_future, maglev_escape_analysis)
@@ -2499,7 +2500,7 @@ DEFINE_BOOL_READONLY(fast_map_update, false,
24992500
DEFINE_INT(max_valid_polymorphic_map_count, 4,
25002501
"maximum number of valid maps to track in POLYMORPHIC state")
25012502
DEFINE_BOOL(
2502-
clone_object_sidestep_transitions, true,
2503+
clone_object_sidestep_transitions, false,
25032504
"support sidestep transitions for dependency tracking object clone maps")
25042505
DEFINE_WEAK_IMPLICATION(future, clone_object_sidestep_transitions)
25052506

0 commit comments

Comments
 (0)