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

Unified Diff: runtime/vm/flow_graph_compiler_arm64.cc

Issue 572913002: Revert r40306 because of crash. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 3 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/flow_graph_compiler_arm.cc ('k') | runtime/vm/flow_graph_compiler_ia32.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_compiler_arm64.cc
===================================================================
--- runtime/vm/flow_graph_compiler_arm64.cc (revision 40311)
+++ runtime/vm/flow_graph_compiler_arm64.cc (working copy)
@@ -1113,7 +1113,8 @@
RawPcDescriptors::Kind kind,
LocationSummary* locs) {
__ BranchLinkPatchable(label);
- RecordCallInfo(token_pos, kind, Isolate::kNoDeoptId, locs, 0);
+ AddCurrentDescriptor(kind, Isolate::kNoDeoptId, token_pos);
+ RecordSafepoint(locs);
}
@@ -1123,7 +1124,18 @@
RawPcDescriptors::Kind kind,
LocationSummary* locs) {
__ BranchLinkPatchable(label);
- RecordCallInfo(token_pos, kind, deopt_id, locs, locs->input_count());
+ AddCurrentDescriptor(kind, deopt_id, token_pos);
+ RecordSafepoint(locs);
+ // Marks either the continuation point in unoptimized code or the
+ // deoptimization point in optimized code, after call.
+ const intptr_t deopt_id_after = Isolate::ToDeoptAfter(deopt_id);
+ if (is_optimizing()) {
+ AddDeoptIndexAtCall(deopt_id_after, token_pos);
+ } else {
+ // Add deoptimization continuation point after the call and before the
+ // arguments are removed.
+ AddCurrentDescriptor(RawPcDescriptors::kDeopt, deopt_id_after, token_pos);
+ }
}
@@ -1133,7 +1145,20 @@
intptr_t argument_count,
LocationSummary* locs) {
__ CallRuntime(entry, argument_count);
- RecordCallInfo(token_pos, RawPcDescriptors::kOther, deopt_id, locs, 0);
+ AddCurrentDescriptor(RawPcDescriptors::kOther, deopt_id, token_pos);
+ RecordSafepoint(locs);
+ if (deopt_id != Isolate::kNoDeoptId) {
+ // Marks either the continuation point in unoptimized code or the
+ // deoptimization point in optimized code, after call.
+ const intptr_t deopt_id_after = Isolate::ToDeoptAfter(deopt_id);
+ if (is_optimizing()) {
+ AddDeoptIndexAtCall(deopt_id_after, token_pos);
+ } else {
+ // Add deoptimization continuation point after the call and before the
+ // arguments are removed.
+ AddCurrentDescriptor(RawPcDescriptors::kDeopt, deopt_id_after, token_pos);
+ }
+ }
}
@@ -1253,8 +1278,10 @@
__ LoadObject(R4, arguments_descriptor, PP);
__ AddImmediate(R1, R1, Instructions::HeaderSize() - kHeapObjectTag, PP);
__ blr(R1);
- RecordCallInfo(
- token_pos, RawPcDescriptors::kOther, deopt_id, locs, locs->input_count());
+ AddCurrentDescriptor(RawPcDescriptors::kOther,
+ Isolate::kNoDeoptId, token_pos);
+ RecordSafepoint(locs);
+ AddDeoptIndexAtCall(Isolate::ToDeoptAfter(deopt_id), token_pos);
__ Drop(argument_count);
}
« no previous file with comments | « runtime/vm/flow_graph_compiler_arm.cc ('k') | runtime/vm/flow_graph_compiler_ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698