Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(901)

Unified Diff: src/isolate.cc

Issue 2675203005: Clear pending message during Isolate::CancelScheduledExceptionFromTryCatch. (Closed)
Patch Set: Merge branch 'master' into schedule-clear-pending-message Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | test/unittests/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/isolate.cc
diff --git a/src/isolate.cc b/src/isolate.cc
index 9bb29feff8cd4b4eb79208bdd7454614b51f8b62..d54654f9c6f607c30b9d0b73718c0bf4e5e7ead8 100644
--- a/src/isolate.cc
+++ b/src/isolate.cc
@@ -1460,6 +1460,9 @@ void Isolate::CancelScheduledExceptionFromTryCatch(v8::TryCatch* handler) {
DCHECK(scheduled_exception() != heap()->termination_exception());
clear_scheduled_exception();
}
+ if (thread_local_top_.pending_message_obj_ == handler->message_obj_) {
+ clear_pending_message();
+ }
}
« no previous file with comments | « no previous file | test/unittests/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698