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

Unified Diff: runtime/vm/deferred_objects.cc

Issue 1291543003: Revert "VM: Materialize stub pc-markers (smi 0) eagerly on deoptimization." (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 4 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 | runtime/vm/deopt_instructions.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/deferred_objects.cc
diff --git a/runtime/vm/deferred_objects.cc b/runtime/vm/deferred_objects.cc
index 7a0b08e975e51c610d0695c14fdf2e6b0db351cd..a647af1768a356b2db103551cd94df8463f4cd59 100644
--- a/runtime/vm/deferred_objects.cc
+++ b/runtime/vm/deferred_objects.cc
@@ -161,8 +161,11 @@ void DeferredPcMarker::Materialize(DeoptContext* deopt_context) {
uword* dest_addr = reinterpret_cast<uword*>(slot());
Function& function = Function::Handle(zone);
function ^= deopt_context->ObjectAt(index_);
- // Null case is already handled in DeoptPcMarkerInstr::Execute.
- ASSERT(!function.IsNull());
+ if (function.IsNull()) {
+ // Callee's PC marker is not used (pc of Deoptimize stub). Set to 0.
+ *dest_addr = 0;
+ return;
+ }
const Error& error = Error::Handle(zone,
Compiler::EnsureUnoptimizedCode(thread, function));
if (!error.IsNull()) {
« no previous file with comments | « no previous file | runtime/vm/deopt_instructions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698