mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -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>
36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Tue, 31 May 2022 19:58:01 +0200
|
|
Subject: chore: disable is_execution_terminating DCHECK
|
|
|
|
This causes a slew of crashes in Node.js.
|
|
|
|
Upstream issue opened at https://github.com/nodejs/node-v8/issues/227.
|
|
|
|
diff --git a/src/api/api-macros.h b/src/api/api-macros.h
|
|
index 149dd0555a69be576fd1eb97aa79b8aedafcac04..233e6d2ac511c4a7fa45d47bb7448beead52faf1 100644
|
|
--- a/src/api/api-macros.h
|
|
+++ b/src/api/api-macros.h
|
|
@@ -97,8 +97,6 @@
|
|
|
|
// Lightweight version for APIs that don't require an active context.
|
|
#define DCHECK_NO_SCRIPT_NO_EXCEPTION(i_isolate) \
|
|
- /* Embedders should never enter V8 after terminating it */ \
|
|
- DCHECK(!i_isolate->is_execution_terminating()); \
|
|
DCHECK_NO_SCRIPT_NO_EXCEPTION_MAYBE_TEARDOWN(i_isolate)
|
|
|
|
#define ENTER_V8_NO_SCRIPT_NO_EXCEPTION(i_isolate) \
|
|
diff --git a/src/execution/microtask-queue.cc b/src/execution/microtask-queue.cc
|
|
index ac48de9b499aed29a09ba918ddabfa67cd5485da..aa50aeb1d4f3943f83ded5e328b4a65bcfbc7317 100644
|
|
--- a/src/execution/microtask-queue.cc
|
|
+++ b/src/execution/microtask-queue.cc
|
|
@@ -180,7 +180,7 @@ int MicrotaskQueue::RunMicrotasks(Isolate* isolate) {
|
|
|
|
if (isolate->is_execution_terminating()) {
|
|
DCHECK(isolate->has_scheduled_exception());
|
|
- DCHECK(maybe_result.is_null());
|
|
+ // DCHECK(maybe_result.is_null());
|
|
delete[] ring_buffer_;
|
|
ring_buffer_ = nullptr;
|
|
capacity_ = 0;
|