mirror of
https://github.com/electron/electron.git
synced 2026-05-02 03:00:22 -04:00
56f042f5e5
* chore: bump chromium in DEPS to 110.0.5481.24 * chore: update patches * 4098946: Migrate Extension::Create() argument to base::Value::Dict (part 4 of 4) https://chromium-review.googlesource.com/c/chromium/src/+/4098946 (cherry picked from commit716a0f66f6) * chore: bump chromium in DEPS to 110.0.5481.30 * chore: update patches * chore: cleanup password from keychain after test (cherry picked from commit6c3b0f84c5) * 4143761: [110] Disable SwiftShader for WebGL on M1 Macs. https://chromium-review.googlesource.com/c/chromium/src/+/4143761 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
49 lines
2.4 KiB
Diff
49 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Rose <japthorp@slack-corp.com>
|
|
Date: Mon, 9 May 2022 17:09:21 -0700
|
|
Subject: Revert "[runtime] DHCECK terminating exception in Microtasks"
|
|
|
|
This reverts commit bccb536c98181e8a6e9cf0b6342311adbbf61aca.
|
|
|
|
diff --git a/src/builtins/builtins-microtask-queue-gen.cc b/src/builtins/builtins-microtask-queue-gen.cc
|
|
index f58636fee555d782e18b7521c0c4f28ed60b3a52..6b0c63b34ff09f70cb9a4fe419f3b9bb0adf6790 100644
|
|
--- a/src/builtins/builtins-microtask-queue-gen.cc
|
|
+++ b/src/builtins/builtins-microtask-queue-gen.cc
|
|
@@ -118,7 +118,6 @@ void MicrotaskQueueBuiltinsAssembler::PrepareForContext(
|
|
void MicrotaskQueueBuiltinsAssembler::RunSingleMicrotask(
|
|
TNode<Context> current_context, TNode<Microtask> microtask) {
|
|
CSA_DCHECK(this, TaggedIsNotSmi(microtask));
|
|
- CSA_DCHECK(this, Word32BinaryNot(IsExecutionTerminating()));
|
|
|
|
StoreRoot(RootIndex::kCurrentMicrotask, microtask);
|
|
TNode<IntPtrT> saved_entered_context_count = GetEnteredContextCount();
|
|
diff --git a/src/codegen/code-stub-assembler.cc b/src/codegen/code-stub-assembler.cc
|
|
index 23111e605f4390d311a0fac2b4335926315add38..2e3a2cbcac07e0e86254d4cb11eb3fe51fadff18 100644
|
|
--- a/src/codegen/code-stub-assembler.cc
|
|
+++ b/src/codegen/code-stub-assembler.cc
|
|
@@ -6390,12 +6390,6 @@ void CodeStubAssembler::SetPendingMessage(TNode<HeapObject> message) {
|
|
StoreFullTaggedNoWriteBarrier(pending_message, message);
|
|
}
|
|
|
|
-TNode<BoolT> CodeStubAssembler::IsExecutionTerminating() {
|
|
- TNode<HeapObject> pending_message = GetPendingMessage();
|
|
- return TaggedEqual(pending_message,
|
|
- LoadRoot(RootIndex::kTerminationException));
|
|
-}
|
|
-
|
|
TNode<BoolT> CodeStubAssembler::InstanceTypeEqual(TNode<Int32T> instance_type,
|
|
int type) {
|
|
return Word32Equal(instance_type, Int32Constant(type));
|
|
diff --git a/src/codegen/code-stub-assembler.h b/src/codegen/code-stub-assembler.h
|
|
index f7cdced051d23a755158bb73c91057bb1d801830..183bae89819584d48fc61e06cf9cf9792b02a61a 100644
|
|
--- a/src/codegen/code-stub-assembler.h
|
|
+++ b/src/codegen/code-stub-assembler.h
|
|
@@ -2583,7 +2583,6 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
|
|
|
|
TNode<HeapObject> GetPendingMessage();
|
|
void SetPendingMessage(TNode<HeapObject> message);
|
|
- TNode<BoolT> IsExecutionTerminating();
|
|
|
|
// Type checks.
|
|
// Check whether the map is for an object with special properties, such as a
|