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

Unified Diff: runtime/vm/stub_code_dbc.cc

Issue 2741553002: Do not rely on code patching on DBC for lazy deoptimization. (Closed)
Patch Set: Code review Created 3 years, 9 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 | « runtime/vm/simulator_dbc.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/stub_code_dbc.cc
diff --git a/runtime/vm/stub_code_dbc.cc b/runtime/vm/stub_code_dbc.cc
index bf3783b1fd88c8a0035f08bca13fd7d98b952f29..7fc405bdceaa622c055b35da01e05836ff7a3e4d 100644
--- a/runtime/vm/stub_code_dbc.cc
+++ b/runtime/vm/stub_code_dbc.cc
@@ -49,6 +49,7 @@ void StubCode::GenerateRunExceptionHandlerStub(Assembler* assembler) {
void StubCode::GenerateDeoptForRewindStub(Assembler* assembler) {
__ DeoptRewind();
+ __ Trap();
}
@@ -75,12 +76,14 @@ void StubCode::GenerateMegamorphicMissStub(Assembler* assembler) {
// with something meaningful to make sure GC can scan the stack during
// the last phase of deoptimization which materializes objects.
void StubCode::GenerateDeoptimizeLazyFromReturnStub(Assembler* assembler) {
- __ Trap();
+ __ Deopt(0 /* unused */, 0 /* lazy */);
+ __ Trap(); // Not reached: pc is updated as part of deoptimization.
}
void StubCode::GenerateDeoptimizeLazyFromThrowStub(Assembler* assembler) {
- __ Trap();
+ __ Deopt(0 /* unused */, 0 /* lazy */);
+ __ Trap(); // Not reached: pc is updated as part of deoptimization.
}
« no previous file with comments | « runtime/vm/simulator_dbc.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698