mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

chore: combine parallel/test-v8-stats v8 patches (#37801)

Browse source 
* chore: combine parallel/test-v8-stats v8 patches

* chore: update patches

---------

Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
This commit is contained in:
Shelley Vohr 2023-04-04 10:19:45 +02:00 committed by GitHub
parent 4ba5723aed
commit 0b4ef2b1e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
patches/node/.patches
View file

@ -27,7 +27,6 @@ v8_api_advance_api_deprecation.patch
fixup_for_error_declaration_shadows_a_local_variable.patch fixup_for_error_declaration_shadows_a_local_variable.patch
fix_parallel_test-v8-stats.patch fix_parallel_test-v8-stats.patch
fix_expose_the_built-in_electron_module_via_the_esm_loader.patch fix_expose_the_built-in_electron_module_via_the_esm_loader.patch
heap_remove_allocationspace_map_space_enum_constant.patch
api_pass_oomdetails_to_oomerrorcallback.patch api_pass_oomdetails_to_oomerrorcallback.patch
fix_expose_lookupandcompile_with_parameters.patch fix_expose_lookupandcompile_with_parameters.patch
fix_prevent_changing_functiontemplateinfo_after_publish.patch fix_prevent_changing_functiontemplateinfo_after_publish.patch

19
patches/node/fix_parallel_test-v8-stats.patch
View file

@ -3,15 +3,24 @@ From: Jeremy Rose <japthorp@slack-corp.com>
Date: Thu, 29 Sep 2022 16:30:17 -0700 Date: Thu, 29 Sep 2022 16:30:17 -0700
Subject: fix parallel/test-v8-stats Subject: fix parallel/test-v8-stats
new heap spaces were added in v8, this updates the expectations to Refs https://chromium-review.googlesource.com/c/v8/v8/+/3967841
match. node should eventually have this too once they roll up the newer Refs https://chromium-review.googlesource.com/c/v8/v8/+/3892950.
v8.
Heap spaces were added/removed in v8 - this patch updates test expectations
to match.
This patch can be removed when Electron updates to Node.js v20.
diff --git a/test/parallel/test-v8-stats.js b/test/parallel/test-v8-stats.js diff --git a/test/parallel/test-v8-stats.js b/test/parallel/test-v8-stats.js
index 2eaa3c5b0609149271afb85d7ecc33272e0ada2e..3af7ea1e4a4598dc4125ff78e426d6dc6a025c66 100644 index 2eaa3c5b0609149271afb85d7ecc33272e0ada2e..83b375bd3c5b5dbd5189d48ad560580883ac91f6 100644
--- a/test/parallel/test-v8-stats.js --- a/test/parallel/test-v8-stats.js
+++ b/test/parallel/test-v8-stats.js +++ b/test/parallel/test-v8-stats.js
@@ -47,6 +47,8 @@ const expectedHeapSpaces = [ @@ -42,11 +42,12 @@ const expectedHeapSpaces = [
'code_large_object_space',
'code_space',
'large_object_space',
- 'map_space',
'new_large_object_space',
'new_space', 'new_space',
'old_space', 'old_space',
'read_only_space', 'read_only_space',

20
patches/node/heap_remove_allocationspace_map_space_enum_constant.patch
View file

@ -1,20 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Wed, 26 Oct 2022 16:14:20 -0400
Subject: Remove AllocationSpace::MAP_SPACE enum constant
This was removed in:
https://chromium-review.googlesource.com/c/v8/v8/+/3967841
diff --git a/test/parallel/test-v8-stats.js b/test/parallel/test-v8-stats.js
index 3af7ea1e4a4598dc4125ff78e426d6dc6a025c66..83b375bd3c5b5dbd5189d48ad560580883ac91f6 100644
--- a/test/parallel/test-v8-stats.js
+++ b/test/parallel/test-v8-stats.js
@@ -42,7 +42,6 @@ const expectedHeapSpaces = [
'code_large_object_space',
'code_space',
'large_object_space',
- 'map_space',
'new_large_object_space',
'new_space',
'old_space',