github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: update patches

Browse Source
This commit is contained in:
PatchUp
2024-05-02 14:43:18 +00:00
parent 098852ed9a
commit 620f0df58f
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/DirectXShaderCompiler/cherry-pick-bd7aa9779873.patch
View File

@@ -1,7 +1,8 @@
From bd7aa97798735e1288d36de41dcda75e867550e4 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Antonio Maiorano <amaiorano@google.com> From: Antonio Maiorano <amaiorano@google.com>
Date: Thu, 25 Apr 2024 16:49:11 -0400 Date: Thu, 25 Apr 2024 16:49:11 -0400
Subject: [PATCH] Fixed crash in loop unroll caused by bug in structurize loop exits (#6548) Subject: Fixed crash in loop unroll caused by bug in structurize loop exits
(#6548)
Fixed a bug in `hlsl::RemoveUnstructuredLoopExits` where when a new Fixed a bug in `hlsl::RemoveUnstructuredLoopExits` where when a new
exiting block is created from splitting, it was added to the current exiting block is created from splitting, it was added to the current
@@ -18,13 +19,12 @@ Change-Id: I7efc21bc61aeb81b4906a600c35272af232710ea
Reviewed-on: https://chromium-review.googlesource.com/c/external/github.com/microsoft/DirectXShaderCompiler/+/5490380 Reviewed-on: https://chromium-review.googlesource.com/c/external/github.com/microsoft/DirectXShaderCompiler/+/5490380
Reviewed-by: James Price <jrprice@google.com> Reviewed-by: James Price <jrprice@google.com>
Reviewed-by: Ben Clayton <bclayton@chromium.org> Reviewed-by: Ben Clayton <bclayton@chromium.org>
---
diff --git a/lib/Transforms/Scalar/DxilRemoveUnstructuredLoopExits.cpp b/lib/Transforms/Scalar/DxilRemoveUnstructuredLoopExits.cpp diff --git a/lib/Transforms/Scalar/DxilRemoveUnstructuredLoopExits.cpp b/lib/Transforms/Scalar/DxilRemoveUnstructuredLoopExits.cpp
index b6a07d6..ef6718f 100644 index b6a07d6b27a23ee3831e84cee82299d6d405a288..ef6718f0f22ee33e3f16f9801a64c1a6fb6c653a 100644
--- a/lib/Transforms/Scalar/DxilRemoveUnstructuredLoopExits.cpp --- a/lib/Transforms/Scalar/DxilRemoveUnstructuredLoopExits.cpp
+++ b/lib/Transforms/Scalar/DxilRemoveUnstructuredLoopExits.cpp +++ b/lib/Transforms/Scalar/DxilRemoveUnstructuredLoopExits.cpp
@@ -447,7 +447,12 @@ @@ -447,7 +447,12 @@ static bool RemoveUnstructuredLoopExitsIteration(BasicBlock *exiting_block,
new_exiting_block->splitBasicBlock(new_exiting_block->getFirstNonPHI()); new_exiting_block->splitBasicBlock(new_exiting_block->getFirstNonPHI());
new_exiting_block->setName("dx.struct_exit.new_exiting"); new_exiting_block->setName("dx.struct_exit.new_exiting");
new_not_exiting_block->setName(old_name); new_not_exiting_block->setName(old_name);
@@ -39,10 +39,10 @@ index b6a07d6..ef6718f 100644
// Branch to latch_exit // Branch to latch_exit
new_exiting_block->getTerminator()->eraseFromParent(); new_exiting_block->getTerminator()->eraseFromParent();
diff --git a/lib/Transforms/Scalar/LoopUnrollPass.cpp b/lib/Transforms/Scalar/LoopUnrollPass.cpp diff --git a/lib/Transforms/Scalar/LoopUnrollPass.cpp b/lib/Transforms/Scalar/LoopUnrollPass.cpp
index dd520f7..b17a5a4 100644 index dd520f7e57d25311be7f3773849a00efaabe6717..b17a5a4a0bc368f16020c4153370ea2c92e5c26c 100644
--- a/lib/Transforms/Scalar/LoopUnrollPass.cpp --- a/lib/Transforms/Scalar/LoopUnrollPass.cpp
+++ b/lib/Transforms/Scalar/LoopUnrollPass.cpp +++ b/lib/Transforms/Scalar/LoopUnrollPass.cpp
@@ -155,6 +155,18 @@ @@ -155,6 +155,18 @@ namespace {
bool UserAllowPartial; bool UserAllowPartial;
bool UserRuntime; bool UserRuntime;
@@ -63,7 +63,7 @@ index dd520f7..b17a5a4 100644
/// This transformation requires natural loop information & requires that /// This transformation requires natural loop information & requires that
diff --git a/tools/clang/test/DXC/loop_structurize_exit_inner_latch_regression.ll b/tools/clang/test/DXC/loop_structurize_exit_inner_latch_regression.ll diff --git a/tools/clang/test/DXC/loop_structurize_exit_inner_latch_regression.ll b/tools/clang/test/DXC/loop_structurize_exit_inner_latch_regression.ll
new file mode 100644 new file mode 100644
index 0000000..7431355 index 0000000000000000000000000000000000000000..743135541cd8faec287164ba3b321a59432832b6
--- /dev/null --- /dev/null
+++ b/tools/clang/test/DXC/loop_structurize_exit_inner_latch_regression.ll +++ b/tools/clang/test/DXC/loop_structurize_exit_inner_latch_regression.ll
@@ -0,0 +1,75 @@ @@ -0,0 +1,75 @@
@@ -143,10 +143,10 @@ index 0000000..7431355
+!3 = distinct !{!3, !4} +!3 = distinct !{!3, !4}
+!4 = !{!"llvm.loop.unroll.full"} +!4 = !{!"llvm.loop.unroll.full"}
diff --git a/utils/hct/hctdb.py b/utils/hct/hctdb.py diff --git a/utils/hct/hctdb.py b/utils/hct/hctdb.py
index 77f5671..ca8d16b 100644 index 77f5671016eb66a4ddf8a943ec8cb05e8d87c9cd..ca8d16bd2562e26e8572413499d32dc2232de5c0 100644
--- a/utils/hct/hctdb.py --- a/utils/hct/hctdb.py
+++ b/utils/hct/hctdb.py +++ b/utils/hct/hctdb.py
@@ -6680,6 +6680,12 @@ @@ -6680,6 +6680,12 @@ class db_dxil(object):
"t": "unsigned", "t": "unsigned",
"d": "Unrolled size limit for loops with an unroll(full) or unroll_count pragma.", "d": "Unrolled size limit for loops with an unroll(full) or unroll_count pragma.",
}, },

17
patches/chromium/cherry-pick-98bcf9ef5cdd.patch
View File

@@ -1,7 +1,7 @@
From 98bcf9ef5cdd3a19f8b739f2cc6b2afdb01b7694 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tommy Steimel <steimel@chromium.org> From: Tommy Steimel <steimel@chromium.org>
Date: Tue, 23 Apr 2024 19:29:23 +0000 Date: Tue, 23 Apr 2024 19:29:23 +0000
Subject: [PATCH] [M124][document pip] Don't assume the enter event window is a LocalDOMWindow Subject: Don't assume the enter event window is a LocalDOMWindow
This CL changes DocumentPictureInPictureEvent to store a DOMWindow This CL changes DocumentPictureInPictureEvent to store a DOMWindow
instead of a LocalDOMWindow to prevent crashes when the window it gets instead of a LocalDOMWindow to prevent crashes when the window it gets
@@ -20,13 +20,12 @@ Auto-Submit: Tommy Steimel <steimel@chromium.org>
Commit-Queue: Frank Liberato <liberato@chromium.org> Commit-Queue: Frank Liberato <liberato@chromium.org>
Cr-Commit-Position: refs/branch-heads/6367@{#974} Cr-Commit-Position: refs/branch-heads/6367@{#974}
Cr-Branched-From: d158c6dc6e3604e6f899041972edf26087a49740-refs/heads/main@{#1274542} Cr-Branched-From: d158c6dc6e3604e6f899041972edf26087a49740-refs/heads/main@{#1274542}
---
diff --git a/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.cc b/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.cc diff --git a/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.cc b/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.cc
index 037813c..572d0803 100644 index 037813c62c2f0dfc78b3451320a799a349ffde23..572d0803c25a99ef5dfd631e7872b05a681f0444 100644
--- a/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.cc --- a/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.cc
+++ b/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.cc +++ b/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.cc
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@ namespace blink {
DocumentPictureInPictureEvent* DocumentPictureInPictureEvent::Create( DocumentPictureInPictureEvent* DocumentPictureInPictureEvent::Create(
const AtomicString& type, const AtomicString& type,
@@ -35,7 +34,7 @@ index 037813c..572d0803 100644
return MakeGarbageCollected<DocumentPictureInPictureEvent>( return MakeGarbageCollected<DocumentPictureInPictureEvent>(
type, document_picture_in_picture_window); type, document_picture_in_picture_window);
} }
@@ -19,13 +19,13 @@ @@ -19,13 +19,13 @@ DocumentPictureInPictureEvent* DocumentPictureInPictureEvent::Create(
return MakeGarbageCollected<DocumentPictureInPictureEvent>(type, initializer); return MakeGarbageCollected<DocumentPictureInPictureEvent>(type, initializer);
} }
@@ -51,7 +50,7 @@ index 037813c..572d0803 100644
: Event(type, Bubbles::kYes, Cancelable::kNo), : Event(type, Bubbles::kYes, Cancelable::kNo),
document_picture_in_picture_window_(document_picture_in_picture_window) {} document_picture_in_picture_window_(document_picture_in_picture_window) {}
@@ -33,8 +33,7 @@ @@ -33,8 +33,7 @@ DocumentPictureInPictureEvent::DocumentPictureInPictureEvent(
AtomicString const& type, AtomicString const& type,
const DocumentPictureInPictureEventInit* initializer) const DocumentPictureInPictureEventInit* initializer)
: Event(type, initializer), : Event(type, initializer),
@@ -62,7 +61,7 @@ index 037813c..572d0803 100644
void DocumentPictureInPictureEvent::Trace(Visitor* visitor) const { void DocumentPictureInPictureEvent::Trace(Visitor* visitor) const {
visitor->Trace(document_picture_in_picture_window_); visitor->Trace(document_picture_in_picture_window_);
diff --git a/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.h b/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.h diff --git a/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.h b/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.h
index 7af20221..59cd8cb 100644 index 7af2022146905a3c3d71e1420aaa68da30e6a9ce..59cd8cb7a2e3a2e2a81db1d146f8075b13755c0e 100644
--- a/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.h --- a/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.h
+++ b/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.h +++ b/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.h
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
@@ -74,7 +73,7 @@ index 7af20221..59cd8cb 100644
#include "third_party/blink/renderer/modules/event_modules.h" #include "third_party/blink/renderer/modules/event_modules.h"
#include "third_party/blink/renderer/platform/wtf/text/atomic_string.h" #include "third_party/blink/renderer/platform/wtf/text/atomic_string.h"
@@ -18,22 +18,21 @@ @@ -18,22 +18,21 @@ class MODULES_EXPORT DocumentPictureInPictureEvent final : public Event {
DEFINE_WRAPPERTYPEINFO(); DEFINE_WRAPPERTYPEINFO();
public: public: