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

Unified Diff: runtime/vm/deferred_objects.cc

Issue 1192103004: VM: New calling convention for generated code. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 6 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
Index: runtime/vm/deferred_objects.cc
diff --git a/runtime/vm/deferred_objects.cc b/runtime/vm/deferred_objects.cc
index a647af1768a356b2db103551cd94df8463f4cd59..9ccee76f5c807e30dc23ace6cb5c4c0c24e400ea 100644
--- a/runtime/vm/deferred_objects.cc
+++ b/runtime/vm/deferred_objects.cc
@@ -161,11 +161,8 @@ void DeferredPcMarker::Materialize(DeoptContext* deopt_context) {
uword* dest_addr = reinterpret_cast<uword*>(slot());
Function& function = Function::Handle(zone);
function ^= deopt_context->ObjectAt(index_);
- if (function.IsNull()) {
- // Callee's PC marker is not used (pc of Deoptimize stub). Set to 0.
- *dest_addr = 0;
- return;
- }
+ // Null case is already handled in DeoptPcMarkerInstr::Execute.
+ ASSERT(!function.IsNull());
const Error& error = Error::Handle(zone,
Compiler::EnsureUnoptimizedCode(thread, function));
if (!error.IsNull()) {
@@ -174,9 +171,7 @@ void DeferredPcMarker::Materialize(DeoptContext* deopt_context) {
const Code& code = Code::Handle(zone, function.unoptimized_code());
ASSERT(!code.IsNull());
ASSERT(function.HasCode());
- const intptr_t pc_marker =
- code.EntryPoint() + Assembler::EntryPointToPcMarkerOffset();
- *dest_addr = pc_marker;
+ *reinterpret_cast<RawObject**>(dest_addr) = code.raw();
if (FLAG_trace_deoptimization_verbose) {
OS::PrintErr("materializing pc marker at 0x%" Px ": %s, %s\n",

Powered by Google App Engine
This is Rietveld 408576698