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

update patches

Browse source
This commit is contained in:
Jeremy Apthorp 2019-05-22 11:18:44 -07:00
parent da98beac54
commit ec3a4cea6a
21 changed files with 64 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
patches/common/chromium/blink_local_frame.patch
View file

@ -14,7 +14,7 @@ when there is code doing that.
This patch reverts the change to fix the crash in Electron.
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index 063a9ecc319c0dd575362bf0887373365cd37191..11f36d34ef71735157b08f023d5b8b3b3e2d3b8b 100644
index b5e3f6498dbbc4dafffe39eca93d0f477868001a..22bb327aa2f17c6f2807341475c010eff54317c4 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -392,10 +392,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {

2
patches/common/chromium/blink_world_context.patch
View file

@ -19,7 +19,7 @@ index 82fb3fdfe6bfa8c8d885ee133270b6f2564325a8..f3bad71eab608d3b9ac0e08446c9e520
// that the script evaluated to with callback. Script execution can be
// suspend.
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
index 88bb36db8cd1a499c133dcad29a9d20de4cc5ed1..e44ebd669d720d324d525d74e7690dcfeaea3c02 100644
index c8174f4b93b78b9368ef38ecb56e9eccf0b71467..73c2bed83ce240574065e3699617d091a581e9e9 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
@@ -873,6 +873,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {

6
patches/common/chromium/can_create_window.patch
View file

@ -5,10 +5,10 @@ Subject: can_create_window.patch
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 14bc2ffdcdb71e70b294960333eab765332e280d..d2863986ddafcece65fc88b0ad1f5f7a84ecf9a0 100644
index f104289d567bbe184c6f22684fef68e03ddb4f72..bd4241688a301a53b0a315b4031ddf89f0241e6d 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -3725,6 +3725,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -3711,6 +3711,7 @@ void RenderFrameHostImpl::CreateNewWindow(
last_committed_origin_, params->window_container_type,
params->target_url, params->referrer.To<Referrer>(),
params->frame_name, params->disposition, *params->features,
@ -66,7 +66,7 @@ index 5e79a99f045272846f3840547345adffb991421b..2c722d14437cdad69544e0c67921dbae
bool opener_suppressed,
bool* no_javascript_access);
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 25ab2ac5822670c6f912e4b032f280497cb26ec3..8917dbce71a415c60764f52a977c27a6fe8d335e 100644
index 49e1e5647f700350a07ad88306a06122d0f0f204..39c5ce2a631cc1d78e36dbda506212b87f5a1939 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -77,6 +77,7 @@

4
patches/common/chromium/content_browser_main_loop.patch
View file

@ -8,10 +8,10 @@ run before shutdown. This is required to cleanup WebContents asynchronously
in atom::CommonWebContentsDelegate::ResetManageWebContents.
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 6a24bdf80820778fb8cbc627dfb9524ac438e2d3..074fb851cb44df66862f2eb4b2c5830269195cfc 100644
index 5f22028d622e43d2fc0efe68976ec21c4afa60f5..5c180d5367be3df04b51fe00aa3a02abc2fefb60 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -1524,7 +1524,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
@@ -1525,7 +1525,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
}
base::RunLoop run_loop;

6
patches/common/chromium/disable_color_correct_rendering.patch
View file

@ -215,7 +215,7 @@ index f19bbb46ea6f3962f83d10fb400ae55584a17a9e..c5dff79af54a03ef888e4474e5ea5368
service_manager::switches::kGpuSandboxAllowSysVShm,
service_manager::switches::kGpuSandboxFailuresFatal,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index dffe06fa5262a0b6aebe064f8813b149439cb613..59c8ac411b4525f4a866b16c04c1a37a36aef7d5 100644
index 45c7b31e9f8b678fac72c4a1b1e7246e63253121..0fe8a88d4dae61782990b05b9fb32b7dd6f1f21d 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -218,6 +218,7 @@
@ -235,10 +235,10 @@ index dffe06fa5262a0b6aebe064f8813b149439cb613..59c8ac411b4525f4a866b16c04c1a37a
network::switches::kExplicitlyAllowedPorts,
service_manager::switches::kDisableInProcessStackTraces,
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 046e138def4407388c5f668a8e3099c686ad9f9d..b648c09433efe925a098ac94caa797829344a3f6 100644
index 3efeb92f38e2ec5bb7303fa1c66cbab7dc78671c..b67999f475460bd5bf3caa449d27a508c62e5b20 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -2798,6 +2798,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings(
@@ -2799,6 +2799,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings(
settings.main_frame_before_activation_enabled =
cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation);

2
patches/common/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch
View file

@ -6,7 +6,7 @@ Subject: disable_user_gesture_requirement_for_beforeunload_dialogs.patch
See https://github.com/electron/electron/issues/10754
diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
index 709e8f7a942f0b7c3353ec8c92fac48402ccd685..1536d12fffc11f5806bd53eedb0fd081068d2532 100644
index b0c66785d69eb9c1bfbe583b283990e373d5f34a..0b51467333d877ceb7bccffffc963d45e45244a3 100644
--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
@@ -3647,7 +3647,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client,

4
patches/common/chromium/exclude-a-few-test-files-from-build.patch
View file

@ -7,10 +7,10 @@ Compilation of those files fails with the Chromium 68.
Remove the patch during the Chromium 69 upgrade.
diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
index aa6110be2ac2d3d0eea0ccc3616b1c1bf48fae91..43ef9cf475dd3b673c2e92d7a6e7b1a7ce91d09a 100644
index 5a0c974d03b9106d2a41d10de236b6631444e198..8805db465774a292fd8236d345ae9e0cd1640a4f 100644
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1753,7 +1753,7 @@ jumbo_source_set("blink_platform_unittests_sources") {
@@ -1755,7 +1755,7 @@ jumbo_source_set("blink_platform_unittests_sources") {
"graphics/paint/drawing_display_item_test.cc",
"graphics/paint/drawing_recorder_test.cc",
"graphics/paint/float_clip_rect_test.cc",

4
patches/common/chromium/notification_provenance.patch
View file

@ -109,10 +109,10 @@ index 3373171efb690863c70cd10bd465fc4b3dd5320c..64f2c0344eb9978e712f5c39e1f43d9b
// Removes |service| from the list of owned services, for example because the
diff --git a/content/browser/renderer_interface_binders.cc b/content/browser/renderer_interface_binders.cc
index 8a1d31e704be6fdf97c4cd20bd91ad36c6a6f1bd..e9244a5749d09e727df166004eba6fd9e5ff9d69 100644
index 71fbf9411d3d13ffef112b56d79443c91a1999b9..31dc4d18d453b34ab02dbca6784d9a9782e8ff2c 100644
--- a/content/browser/renderer_interface_binders.cc
+++ b/content/browser/renderer_interface_binders.cc
@@ -227,7 +227,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
@@ -220,7 +220,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
RenderProcessHost* host, const url::Origin& origin) {
static_cast<StoragePartitionImpl*>(host->GetStoragePartition())
->GetPlatformNotificationContext()

2
patches/common/chromium/render_widget_host_view_mac.patch
View file

@ -5,7 +5,7 @@ Subject: render_widget_host_view_mac.patch
diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
index 41285370f97be53ec93249c4eb0caf8c77a595b9..3c7eee8a565444f0c66be88885f8826a56acfd18 100644
index 8284524948c54c91e80e61c046ef7a8a7e66ba66..5e0218a0933df9440bcb86ac89373c417d31d206 100644
--- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
+++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
@@ -142,6 +142,11 @@ void ExtractUnderlines(NSAttributedString* string,

6
patches/common/chromium/resource_file_conflict.patch
View file

@ -52,10 +52,10 @@ Some alternatives to this patch:
None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index ebb498247b2b228f166a52a0f7455f0dee916bcc..99e9cb9f2d6332d6b519275cea3deef9af3139f6 100644
index a1be2930c8dd785b1805260a82b37f8acfa80a5d..b7532fd8e220ecf1039bfa00412f9e930f7d1b02 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1784,7 +1784,7 @@ if (is_chrome_branded && !is_android) {
@@ -1789,7 +1789,7 @@ if (is_chrome_branded && !is_android) {
}
}
@ -64,7 +64,7 @@ index ebb498247b2b228f166a52a0f7455f0dee916bcc..99e9cb9f2d6332d6b519275cea3deef9
chrome_paks("packed_resources") {
if (is_mac) {
output_dir = "$root_gen_dir/repack"
@@ -1808,6 +1808,12 @@ if (!is_android) {
@@ -1813,6 +1813,12 @@ if (!is_android) {
}
}

2
patches/common/chromium/revert_build_swiftshader_for_arm32.patch
View file

@ -6,7 +6,7 @@ Subject: Revert "Build swiftshader for ARM32."
This reverts commit e7caa7ca82fc015675aea8cecf178c83a94ab3a7.
diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn
index 70246bcc843422f4ad3e63ce4905b639384e5798..7ca67cb078928025b654e4c36baf6ffd78594a1e 100644
index a54c5b0f49a1abd48688ef5359892ac4c4b5af16..ad9bf97a1e948f348b04791638cce9e038342ab2 100644
--- a/ui/gl/BUILD.gn
+++ b/ui/gl/BUILD.gn
@@ -15,8 +15,8 @@ declare_args() {

2
patches/common/chromium/support_mixed_sandbox_with_zygote.patch
View file

@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it
does touch a security-sensitive class.
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 0e9f6e57eac4c1fd1eaf8dd1c86ac1153d1a44b4..dffe06fa5262a0b6aebe064f8813b149439cb613 100644
index af2a147ec4f62ca93b8d376bdaacbef6977eb7d6..45c7b31e9f8b678fac72c4a1b1e7246e63253121 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -418,6 +418,10 @@ class RendererSandboxedProcessLauncherDelegate

12
patches/common/chromium/worker_context_will_destroy.patch
View file

@ -21,10 +21,10 @@ index 5bcf6f95f630ae6232ec9be7d8de7360a1592566..3142a8286e6aaf508a06cee0e32c7390
// An empty URL is returned if the URL is not overriden.
virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index 2e3a922dd2a8a15bfe3eec802085f09d3eda9e5d..30da4053a8438dd018fb2739a6cc0e300af2e657 100644
index 2c8ade035da690db45fc629ef2aeebf701b20c59..3a23749a6b4a938320edcdc01857c5c741c66b6a 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -1056,6 +1056,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
@@ -1051,6 +1051,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
}
@ -38,10 +38,10 @@ index 2e3a922dd2a8a15bfe3eec802085f09d3eda9e5d..30da4053a8438dd018fb2739a6cc0e30
const v8::Local<v8::Context>& worker) {
GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
index f5298e5e942e43008e469214ba252932cc6d771a..ae28b78037e0a078dd9e11fb0cd3edbfdd0ff986 100644
index 39d9cf7590c11a178acbf8f9c6dbc3d20088860c..bef9d6351c2a9456ffc5279343515c017a390d97 100644
--- a/content/renderer/renderer_blink_platform_impl.h
+++ b/content/renderer/renderer_blink_platform_impl.h
@@ -201,6 +201,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -200,6 +200,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
void DidStartWorkerThread() override;
void WillStopWorkerThread() override;
void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
@ -50,10 +50,10 @@ index f5298e5e942e43008e469214ba252932cc6d771a..ae28b78037e0a078dd9e11fb0cd3edbf
void RecordMetricsForBackgroundedRendererPurge() override;
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
index 921175528990fffc8fda609e768be47b856f7621..f52b4d1573c07a9c280d67bc3b2389dd3a549925 100644
index f2a375b8fc9fd8ef808898ace40139f533c5dae4..083e94481c4c9f8a485984c849e5d2960a4cf6b5 100644
--- a/third_party/blink/public/platform/platform.h
+++ b/third_party/blink/public/platform/platform.h
@@ -660,6 +660,7 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -656,6 +656,7 @@ class BLINK_PLATFORM_EXPORT Platform {
virtual void DidStartWorkerThread() {}
virtual void WillStopWorkerThread() {}
virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}

2
patches/common/v8/add_realloc.patch
View file

@ -30,7 +30,7 @@ index 8b23e02bf42ffdab5d8c6f36a4663ed0668531f7..742aaa1df005f28ba55b0c42a18d41e9
* Free the memory block of size |length|, pointed to by |data|.
* That memory is guaranteed to be previously allocated by |Allocate|.
diff --git a/src/api/api.cc b/src/api/api.cc
index 62946e00db8cd844a1de7aa16ea8addaa42f6bc6..4a421e73cb45bf3eb3d6643011151743cf989fee 100644
index ca0707f96fc2563a40a038c762bd41b1dd6c4157..373a692d168fde744e41dbb4295e07d12038ff2c 100644
--- a/src/api/api.cc
+++ b/src/api/api.cc
@@ -514,6 +514,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) {

2
patches/common/v8/build_gn.patch
View file

@ -5,7 +5,7 @@ Subject: build_gn.patch
diff --git a/BUILD.gn b/BUILD.gn
index c1bbdbdf0d1b9968632e0158b02e80f3ddfe06ed..e25b4a427c96a6f66ea693f162a4806723026a91 100644
index 086cb460be65f970b6a3c33d86dd1e2254251b9a..c681ae4b50e85f7a62941e6dcf90f9d59f7b83ed 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -278,7 +278,7 @@ config("internal_config") {

4
patches/common/v8/dcheck.patch
View file

@ -5,7 +5,7 @@ Subject: dcheck.patch
diff --git a/src/api/api.cc b/src/api/api.cc
index 675d3df256143380594577b458d12c9705e7ecf1..fe4a82836995053d8c43a2ace2457eaa95aa8d38 100644
index e3f930127c3133c954352100f98c5cff4a438314..e327588adc62c7f19b77e0d9cdcb4cd342ffdc13 100644
--- a/src/api/api.cc
+++ b/src/api/api.cc
@@ -8248,7 +8248,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
@ -18,7 +18,7 @@ index 675d3df256143380594577b458d12c9705e7ecf1..fe4a82836995053d8c43a2ace2457eaa
isolate->default_microtask_queue()->RunMicrotasks(isolate);
}
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index ee2a4ceed24d92fff94affad47b194576841dff0..3c220a31cf3f913d4161105cbff7347fa1e0df23 100644
index 0a35533253b003f9626ace8fcbb85e9e25b51e01..a7ba98a7ded1d970b849f3295b026509077de61f 100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -4999,9 +4999,9 @@ void Heap::TearDown() {

2
patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch
View file

@ -174,7 +174,7 @@ index 742aaa1df005f28ba55b0c42a18d41e9a74a9b6a..382a9eae997fbc399ee196d2fc58951a
#ifdef V8_ENABLE_CHECKS
CheckCast(value);
diff --git a/src/api/api.cc b/src/api/api.cc
index 4a421e73cb45bf3eb3d6643011151743cf989fee..675d3df256143380594577b458d12c9705e7ecf1 100644
index 373a692d168fde744e41dbb4295e07d12038ff2c..e3f930127c3133c954352100f98c5cff4a438314 100644
--- a/src/api/api.cc
+++ b/src/api/api.cc
@@ -2179,6 +2179,10 @@ int PrimitiveArray::Length() const {

6
patches/common/v8/export_symbols_needed_for_windows_build.patch
View file

@ -6,10 +6,10 @@ Subject: Export symbols needed for Windows build
These symbols are required to build v8 with BUILD_V8_SHARED on Windows.
diff --git a/src/objects.h b/src/objects.h
index c1ae835e89bc7ccd6da36e9c03ca56ee4e07d31e..dc7e78db9ff76917c57f80926e23c7920c7a0c16 100644
index 4f2939416890e7431452c75dc5527ae012dff34a..4b18d159a3b8624ecaf0b896a6854bd8cb255e75 100644
--- a/src/objects.h
+++ b/src/objects.h
@@ -772,7 +772,7 @@ enum class KeyCollectionMode {
@@ -803,7 +803,7 @@ enum class KeyCollectionMode {
// Utility superclass for stack-allocated objects that must be updated
// on gc. It provides two ways for the gc to update instances, either
// iterating or updating after gc.
@ -19,7 +19,7 @@ index c1ae835e89bc7ccd6da36e9c03ca56ee4e07d31e..dc7e78db9ff76917c57f80926e23c792
explicit inline Relocatable(Isolate* isolate);
inline virtual ~Relocatable();
diff --git a/src/objects/ordered-hash-table.h b/src/objects/ordered-hash-table.h
index 6afbb6b662d2fed0ad6258921aa6fe9e641ee7c2..e961d99251afafb9a8c12ce14b57fca4b73bf822 100644
index 949c94f87708e64e39fb8de2131a5363d0d52b82..d20776b017fd57b9f9053b753a045c774e28496c 100644
--- a/src/objects/ordered-hash-table.h
+++ b/src/objects/ordered-hash-table.h
@@ -60,7 +60,7 @@ namespace internal {

2
patches/common/v8/expose_mksnapshot.patch
View file

@ -6,7 +6,7 @@ Subject: expose_mksnapshot.patch
Needed in order to target mksnapshot for mksnapshot zip.
diff --git a/BUILD.gn b/BUILD.gn
index e25b4a427c96a6f66ea693f162a4806723026a91..fff650f31e33cabdddf2c6f6127678379f99bad7 100644
index c681ae4b50e85f7a62941e6dcf90f9d59f7b83ed..72bca2c6719dd68b3a8158613d459f8f12b58626 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -3791,8 +3791,6 @@ if (current_toolchain == v8_generator_toolchain) {

42
patches/common/v8/revert_cctest_add_v8_export_private_to_arm_arm64_ports.patch
View file

@ -6,7 +6,7 @@ Subject: Revert "[cctest] Add V8_EXPORT_PRIVATE to arm/arm64 ports"
This reverts commit 1a7d847cfac9a7363c59c980e47a7b7ff416e6da.
diff --git a/src/arm/assembler-arm.h b/src/arm/assembler-arm.h
index 8157d3cb053fcad45357b3570792e19276670a80..3617d4b71aef412f603470350cb388e7c7515391 100644
index e3b079c32e8f8a29abfe117cba44d3b75f53c49d..e85d0108effe3abb3b88a1a41cce0234751759ef 100644
--- a/src/arm/assembler-arm.h
+++ b/src/arm/assembler-arm.h
@@ -79,7 +79,7 @@ enum Coprocessor {
@ -59,7 +59,7 @@ index 8157d3cb053fcad45357b3570792e19276670a80..3617d4b71aef412f603470350cb388e7
explicit UseScratchRegisterScope(Assembler* assembler);
~UseScratchRegisterScope();
diff --git a/src/arm64/assembler-arm64.h b/src/arm64/assembler-arm64.h
index 2185cad65b7791e65706685066a412ce660c5940..d6d8b4632791f4264ea7a245ef84dbf51fbb5be1 100644
index 2492f30278adae9fb3ff9e995cb9328b4ae8694c..f0ac332c21eb1172324f728c74ae40e131763fd1 100644
--- a/src/arm64/assembler-arm64.h
+++ b/src/arm64/assembler-arm64.h
@@ -49,7 +49,7 @@ class Immediate {
@ -236,7 +236,7 @@ index 8514469227042b5740da73d42fc210a2282414e4..6f46e4b88c2e7c77f6fd58567e9aa2ae
static bool IsValidImmPCOffset(ImmBranchType branch_type, ptrdiff_t offset);
bool IsTargetInImmPCOffsetRange(Instruction* target);
diff --git a/src/arm64/macro-assembler-arm64.h b/src/arm64/macro-assembler-arm64.h
index 62261c9c734de9fe230c52af6fe807a8d444009b..617d709ee5756ede6cb69632520b7d2410562c16 100644
index d345475f18a671879bcf6f5e9063cbcd5b20241b..c607496b373c27b9002c09b5c6d896fc18cf6a92 100644
--- a/src/arm64/macro-assembler-arm64.h
+++ b/src/arm64/macro-assembler-arm64.h
@@ -2082,7 +2082,7 @@ class InstructionAccurateScope {
@ -248,8 +248,18 @@ index 62261c9c734de9fe230c52af6fe807a8d444009b..617d709ee5756ede6cb69632520b7d24
public:
explicit UseScratchRegisterScope(TurboAssembler* tasm)
: available_(tasm->TmpList()),
@@ -2110,8 +2110,7 @@ class V8_EXPORT_PRIVATE UseScratchRegisterScope {
VRegister AcquireSameSizeAs(const VRegister& reg);
private:
- static CPURegister AcquireNextAvailable(
- CPURegList* available);
+ static CPURegister AcquireNextAvailable(CPURegList* available);
// Available scratch registers.
CPURegList* available_; // kRegister
diff --git a/src/arm64/register-arm64.h b/src/arm64/register-arm64.h
index b19f41ef8488a9a117a8c88305c6dbe0dc188d39..956fd9ab04bcc4b314eb6253636e776463332b1b 100644
index 54b927c3f407bfdaf69e8312360da9cd31c159d1..1da32ae6f4f0a9ee082a4e5c4e9871259a14cdef 100644
--- a/src/arm64/register-arm64.h
+++ b/src/arm64/register-arm64.h
@@ -316,14 +316,14 @@ VectorFormat ScalarFormatFromLaneSize(int lanesize);
@ -303,7 +313,7 @@ index b19f41ef8488a9a117a8c88305c6dbe0dc188d39..956fd9ab04bcc4b314eb6253636e7764
template <typename... CPURegisters>
explicit CPURegList(CPURegister reg0, CPURegisters... regs)
diff --git a/src/arm64/simulator-arm64.h b/src/arm64/simulator-arm64.h
index 12f9dcba8c565663a699247bd906c98e78e7790d..e4e3e09e45ad2e2859cbbb5c9720ffa4aaf6d2e6 100644
index e8d06f90034c58f5fb293e3bd56171fa9ad3e20c..c11531f1ea682cb749f456eb375b261779c7890b 100644
--- a/src/arm64/simulator-arm64.h
+++ b/src/arm64/simulator-arm64.h
@@ -656,11 +656,10 @@ class Simulator : public DecoderVisitor, public SimulatorBase {
@ -354,10 +364,10 @@ index 00ed1c20c31bd312fe02920713fb0b937f1fa30e..f57dc861731c5146e26702147841a75d
int LowestSetBitPosition(uint64_t value);
int HighestSetBitPosition(uint64_t value);
uint64_t LargestPowerOf2Divisor(uint64_t value);
diff --git a/src/code-comments.h b/src/code-comments.h
index 0c247fd247151a0bdfbf3a9f420c2eb2fa47b5cd..21543e7f498c0becfcc1121f2f17ebd90be0840e 100644
--- a/src/code-comments.h
+++ b/src/code-comments.h
diff --git a/src/codegen/code-comments.h b/src/codegen/code-comments.h
index f366cd5547885d9e5dca19dd9177322dc375fa7c..fb4d47b6ec4e8982951e96f0226dbaf25185545c 100644
--- a/src/codegen/code-comments.h
+++ b/src/codegen/code-comments.h
@@ -35,7 +35,7 @@ struct CodeCommentEntry {
class CodeCommentsWriter {
@ -399,7 +409,7 @@ index 2fe14f19321c67aaf1dd388472b14c8b5fbfe400..fcc38eb3b2242ce65f872636b9121c66
// Returns -1 if instruction does not mark the beginning of a constant pool,
// or the number of entries in the constant pool beginning here.
diff --git a/src/diagnostics/disassembler.h b/src/diagnostics/disassembler.h
index 1bb326655abb828e42d370e28b5c12908320f47c..8ac5ced6b370fe15f546c0053afb0c404c8fc8dd 100644
index db1b8de69b8d0efff6a7f72094e2298a34753b8b..a58702f0d6bb572a666c0261c84c68a57afb390b 100644
--- a/src/diagnostics/disassembler.h
+++ b/src/diagnostics/disassembler.h
@@ -20,10 +20,8 @@ class Disassembler : public AllStatic {
@ -416,7 +426,7 @@ index 1bb326655abb828e42d370e28b5c12908320f47c..8ac5ced6b370fe15f546c0053afb0c40
} // namespace internal
diff --git a/src/objects.cc b/src/objects.cc
index c254eaf4d6a80cafaf4b17ebef91d794e2034790..9641318f878049c96be8b992e20f459a84635fad 100644
index b2e8a3880f1969e426a52d4760701ae26385bca7..5bac83ff1fc1920c535cc2d53d76518fe6a521d4 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -1239,7 +1239,7 @@ bool Object::ToInt32(int32_t* value) {
@ -429,7 +439,7 @@ index c254eaf4d6a80cafaf4b17ebef91d794e2034790..9641318f878049c96be8b992e20f459a
Handle<SharedFunctionInfo> FunctionTemplateInfo::GetOrCreateSharedFunctionInfo(
Isolate* isolate, Handle<FunctionTemplateInfo> info,
diff --git a/src/objects/code.h b/src/objects/code.h
index fa2580db17c9bb5981800a146e245bf0ea1721a3..afd8fc265b8a2107169811d812e818386d7c539b 100644
index a23763d893bda0003016d84b8f6f8d2c21365fcb..a078d30f2d84e65b087a3bcaf88002f1007a8034 100644
--- a/src/objects/code.h
+++ b/src/objects/code.h
@@ -650,10 +650,9 @@ class DependentCode : public WeakFixedArray {
@ -447,7 +457,7 @@ index fa2580db17c9bb5981800a146e245bf0ea1721a3..afd8fc265b8a2107169811d812e81838
void DeoptimizeDependentCodeGroup(Isolate* isolate, DependencyGroup group);
diff --git a/src/objects/shared-function-info.h b/src/objects/shared-function-info.h
index 31309dc5a89b6433479d95dc9de77401690b004a..ef205cdf90e4426d91c7b6551fd17c9e0667502a 100644
index c7d583cf7e077ee2cf401c37eb44460d6ff97817..38d25fb5536caeaf3293aab023c9c33880e01cbc 100644
--- a/src/objects/shared-function-info.h
+++ b/src/objects/shared-function-info.h
@@ -221,9 +221,7 @@ class InterpreterData : public Struct {
@ -462,7 +472,7 @@ index 31309dc5a89b6433479d95dc9de77401690b004a..ef205cdf90e4426d91c7b6551fd17c9e
// [name]: Returns shared name if it exists or an empty string otherwise.
inline String Name() const;
diff --git a/src/objects/string.cc b/src/objects/string.cc
index 1f044e3299d6a54caa5a81417213970f24fd1954..625ca289807f0300585811eddb95bc9bc8ac6266 100644
index c5ae73b6273e8011fe4c80e34958f0b72c8862c4..8338876fba0cbef611f1e40d047d184d09e4c3dd 100644
--- a/src/objects/string.cc
+++ b/src/objects/string.cc
@@ -1626,8 +1626,5 @@ String ConsStringIterator::NextLeaf(bool* blew_stack) {
@ -475,7 +485,7 @@ index 1f044e3299d6a54caa5a81417213970f24fd1954..625ca289807f0300585811eddb95bc9b
} // namespace internal
} // namespace v8
diff --git a/src/objects/string.h b/src/objects/string.h
index 55e0a365c105a90ca09667c2657911750895c9bc..21cfaaf2abc0adcd09e76cf95cda8a6540b6c49a 100644
index c7e9460904afe50613d811363d5d4c1281796fad..5b152501196c7aff9311f07e7262e4919a3a2a30 100644
--- a/src/objects/string.h
+++ b/src/objects/string.h
@@ -6,7 +6,6 @@
@ -497,7 +507,7 @@ index 55e0a365c105a90ca09667c2657911750895c9bc..21cfaaf2abc0adcd09e76cf95cda8a65
static inline bool IsAscii(const char* chars, int length) {
return IsAscii(reinterpret_cast<const uint8_t*>(chars), length);
@@ -426,11 +425,6 @@ class String : public Name {
@@ -456,11 +455,6 @@ class String : public Name {
OBJECT_CONSTRUCTORS(String, Name);
};

4
patches/common/v8/workaround_an_undefined_symbol_error.patch
View file

@ -12,7 +12,7 @@ By moving some functions out of the the arm64-assembler header file,
this error no longer seems to happen.
diff --git a/src/arm64/assembler-arm64.cc b/src/arm64/assembler-arm64.cc
index eaafa2375b2746fb7a9f63a1fc6703660b2b123c..fa83830f21b068ff79872e5d9eb6031bffd84028 100644
index 988259264aed79549dd2028d8565841500e401c8..b7ab517fd38426100559469dc547c7c9603bceac 100644
--- a/src/arm64/assembler-arm64.cc
+++ b/src/arm64/assembler-arm64.cc
@@ -4013,6 +4013,22 @@ void Assembler::MoveWide(const Register& rd, uint64_t imm, int shift,
@ -39,7 +39,7 @@ index eaafa2375b2746fb7a9f63a1fc6703660b2b123c..fa83830f21b068ff79872e5d9eb6031b
const Operand& operand, FlagsUpdate S, AddSubOp op) {
DCHECK_EQ(rd.SizeInBits(), rn.SizeInBits());
diff --git a/src/arm64/assembler-arm64.h b/src/arm64/assembler-arm64.h
index 9d2f482f31ad9c056a0c65dbf0ff0980f28ee880..2185cad65b7791e65706685066a412ce660c5940 100644
index d814722e6a9eb7b156fc86592cd321682bb68974..2492f30278adae9fb3ff9e995cb9328b4ae8694c 100644
--- a/src/arm64/assembler-arm64.h
+++ b/src/arm64/assembler-arm64.h
@@ -2230,11 +2230,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {