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

Unified Diff: src/deoptimizer.cc

Issue 1865833002: [generators] Decouple generator resume from fullcodegen. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 8 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 | « src/compiler/code-stub-assembler.cc ('k') | src/frames.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/deoptimizer.cc
diff --git a/src/deoptimizer.cc b/src/deoptimizer.cc
index a8405daee32428d8e52f4d32b5fceaf73bf04c92..d69a292f0a83883fcafe9db2ef3552e30e545b76 100644
--- a/src/deoptimizer.cc
+++ b/src/deoptimizer.cc
@@ -296,7 +296,9 @@ void Deoptimizer::DeoptimizeMarkedCodeForContext(Context* context) {
!FLAG_turbo_asm_deoptimization;
bool safe_to_deopt =
deopt_index != Safepoint::kNoDeoptimizationIndex || turbofanned;
- CHECK(topmost_optimized_code == NULL || safe_to_deopt || turbofanned);
+ bool builtin = code->kind() == Code::BUILTIN;
Michael Starzinger 2016/04/06 08:29:33 Not actionable for this CL: As discussed offline,
+ CHECK(topmost_optimized_code == NULL || safe_to_deopt || turbofanned ||
+ builtin);
if (topmost_optimized_code == NULL) {
topmost_optimized_code = code;
safe_to_deopt_topmost_optimized_code = safe_to_deopt;
« no previous file with comments | « src/compiler/code-stub-assembler.cc ('k') | src/frames.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698