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

Unified Diff: runtime/vm/flow_graph_compiler_x64.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_x64.cc
diff --git a/runtime/vm/flow_graph_compiler_x64.cc b/runtime/vm/flow_graph_compiler_x64.cc
index 46851cb09696510980429c2ab0f747f929c1b6a5..f183de655fb89816ec7438f46f46aaed4c9ef56a 100644
--- a/runtime/vm/flow_graph_compiler_x64.cc
+++ b/runtime/vm/flow_graph_compiler_x64.cc
@@ -1219,6 +1219,7 @@ void FlowGraphCompiler::EmitUnoptimizedStaticCall(
UNIMPLEMENTED();
}
ExternalLabel target_label(label_address);
+ __ movq(R10, Immediate(0));
__ LoadObject(RBX, ic_data, PP);
GenerateDartCall(deopt_id,
token_pos,
@@ -1226,6 +1227,9 @@ void FlowGraphCompiler::EmitUnoptimizedStaticCall(
PcDescriptors::kUnoptStaticCall,
locs);
__ Drop(argument_count);
+#if defined(DEBUG)
+ __ movq(R10, Immediate(kInvalidObjectPointer));
+#endif
}
@@ -1276,6 +1280,7 @@ void FlowGraphCompiler::EmitInstanceCall(ExternalLabel* target_label,
intptr_t token_pos,
LocationSummary* locs) {
ASSERT(Array::Handle(ic_data.arguments_descriptor()).Length() > 0);
+ __ movq(R10, Immediate(0));
__ LoadObject(RBX, ic_data, PP);
GenerateDartCall(deopt_id,
token_pos,
@@ -1283,6 +1288,9 @@ void FlowGraphCompiler::EmitInstanceCall(ExternalLabel* target_label,
PcDescriptors::kIcCall,
locs);
__ Drop(argument_count);
+#if defined(DEBUG)
+ __ movq(R10, Immediate(kInvalidObjectPointer));
+#endif
}
@@ -1411,6 +1419,8 @@ void FlowGraphCompiler::EmitEqualityRegRegCompare(Register left,
if (is_optimizing()) {
__ CallPatchable(&StubCode::OptimizedIdenticalWithNumberCheckLabel());
} else {
+ __ movq(R10, Immediate(0));
+ __ movq(RBX, Immediate(0));
__ CallPatchable(&StubCode::UnoptimizedIdenticalWithNumberCheckLabel());
}
if (token_pos != Scanner::kNoSourcePos) {
@@ -1418,6 +1428,13 @@ void FlowGraphCompiler::EmitEqualityRegRegCompare(Register left,
Isolate::kNoDeoptId,
token_pos);
}
+#if defined(DEBUG)
+ // Do this *after* adding the pc descriptor!
+ if (!is_optimizing()) {
+ __ movq(R10, Immediate(kInvalidObjectPointer));
+ __ movq(RBX, Immediate(kInvalidObjectPointer));
+ }
+#endif
// Stub returns result in flags (result of a cmpl, we need ZF computed).
__ popq(right);
__ popq(left);

Powered by Google App Engine
This is Rietveld 408576698