-
Notifications
You must be signed in to change notification settings - Fork 15k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: cherry-pick feef10137b16 from v8 (#31664)
* chore: cherry-pick feef10137b16 from v8 * chore: update patches Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
- Loading branch information
1 parent
a5c6a79
commit e446b29
Showing
2 changed files
with
35 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Toon Verwaest <verwaest@chromium.org> | ||
Date: Wed, 27 Oct 2021 11:02:06 +0200 | ||
Subject: Merged: [runtime] Check if we have a pending exception before | ||
returning it | ||
|
||
Revision: be55c16e50e714475034b00ed2682f0813794d15 | ||
|
||
BUG=chromium:1263462 | ||
NOTRY=true | ||
NOPRESUBMIT=true | ||
NOTREECHECKS=true | ||
R=cbruni@chromium.org | ||
|
||
Change-Id: Ib7de676fe614403674fcd2745c574f7e91ded23f | ||
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3247033 | ||
Reviewed-by: Camillo Bruni <cbruni@chromium.org> | ||
Cr-Commit-Position: refs/branch-heads/9.4@{#52} | ||
Cr-Branched-From: 3b51863bc25492549a8bf96ff67ce481b1a3337b-refs/heads/9.4.146@{#1} | ||
Cr-Branched-From: 2890419fc8fb9bdb507fdd801d76fa7dd9f022b5-refs/heads/master@{#76233} | ||
|
||
diff --git a/src/execution/isolate-inl.h b/src/execution/isolate-inl.h | ||
index a4dad038f0dcc593cddf0aed112e475bfca32e5a..225a096def07c5ffc4dee999177e3048fe2ac4c0 100644 | ||
--- a/src/execution/isolate-inl.h | ||
+++ b/src/execution/isolate-inl.h | ||
@@ -34,7 +34,7 @@ NativeContext Isolate::raw_native_context() { | ||
} | ||
|
||
Object Isolate::pending_exception() { | ||
- DCHECK(has_pending_exception()); | ||
+ CHECK(has_pending_exception()); | ||
DCHECK(!thread_local_top()->pending_exception_.IsException(this)); | ||
return thread_local_top()->pending_exception_; | ||
} |