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

Unified Diff: runtime/vm/flow_graph_compiler_arm.cc

Issue 335443002: Setup R10/EDX to be valid Oops before stub calls (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 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/flow_graph_compiler_arm.cc
diff --git a/runtime/vm/flow_graph_compiler_arm.cc b/runtime/vm/flow_graph_compiler_arm.cc
index d22fc674c274dbebfb86e8fae61700bb954da0dd..007cc8b6688b3fea6ada388ab90ce0b63548d416 100644
--- a/runtime/vm/flow_graph_compiler_arm.cc
+++ b/runtime/vm/flow_graph_compiler_arm.cc
@@ -1209,6 +1209,7 @@ void FlowGraphCompiler::EmitInstanceCall(ExternalLabel* target_label,
intptr_t token_pos,
LocationSummary* locs) {
ASSERT(Array::Handle(ic_data.arguments_descriptor()).Length() > 0);
+ __ LoadImmediate(R4, 0);
__ LoadObject(R5, ic_data);
GenerateDartCall(deopt_id,
token_pos,
@@ -1216,6 +1217,9 @@ void FlowGraphCompiler::EmitInstanceCall(ExternalLabel* target_label,
PcDescriptors::kIcCall,
locs);
__ Drop(argument_count);
+#if defined(DEBUG)
+ __ LoadImmediate(R4, kInvalidObjectPointer);
+#endif
}
@@ -1295,6 +1299,7 @@ void FlowGraphCompiler::EmitUnoptimizedStaticCall(
UNIMPLEMENTED();
}
ExternalLabel target_label(label_address);
+ __ LoadImmediate(R4, 0);
__ LoadObject(R5, ic_data);
GenerateDartCall(deopt_id,
token_pos,
@@ -1302,6 +1307,9 @@ void FlowGraphCompiler::EmitUnoptimizedStaticCall(
PcDescriptors::kUnoptStaticCall,
locs);
__ Drop(argument_count);
+#if defined(DEBUG)
+ __ LoadImmediate(R4, kInvalidObjectPointer);
+#endif
}
@@ -1365,6 +1373,8 @@ void FlowGraphCompiler::EmitEqualityRegRegCompare(Register left,
__ BranchLinkPatchable(
&StubCode::OptimizedIdenticalWithNumberCheckLabel());
} else {
+ __ LoadImmediate(R4, 0);
+ __ LoadImmediate(R5, 0);
__ BranchLinkPatchable(
&StubCode::UnoptimizedIdenticalWithNumberCheckLabel());
}
@@ -1373,6 +1383,13 @@ void FlowGraphCompiler::EmitEqualityRegRegCompare(Register left,
Isolate::kNoDeoptId,
token_pos);
}
+#if defined(DEBUG)
+ if (!is_optimizing()) {
+ // Do this *after* adding the pc descriptor!
+ __ LoadImmediate(R4, kInvalidObjectPointer);
+ __ LoadImmediate(R5, kInvalidObjectPointer);
+ }
+#endif
// Stub returns result in flags (result of a cmpl, we need ZF computed).
__ Pop(right);
__ Pop(left);

Powered by Google App Engine
This is Rietveld 408576698