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

Unified Diff: runtime/vm/intermediate_language_arm.cc

Issue 2896903002: Shuffle around deopt id allocation to give the flow graph builder a chance to record other data as … (Closed)
Patch Set: . Created 3 years, 7 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/intermediate_language.cc ('k') | runtime/vm/intermediate_language_arm64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/intermediate_language_arm.cc
diff --git a/runtime/vm/intermediate_language_arm.cc b/runtime/vm/intermediate_language_arm.cc
index f73507ac3f0e2a8f6b2ba142bf0173134d0c60a2..d49c9e8a025464cce482c3ba6faa33976b8287e3 100644
--- a/runtime/vm/intermediate_language_arm.cc
+++ b/runtime/vm/intermediate_language_arm.cc
@@ -2485,9 +2485,15 @@ void CreateArrayInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
const Code& stub = Code::ZoneHandle(compiler->zone(),
StubCode::AllocateArray_entry()->code());
compiler->AddStubCallTarget(stub);
- compiler->GenerateCallWithDeopt(token_pos(), deopt_id(),
- *StubCode::AllocateArray_entry(),
- RawPcDescriptors::kOther, locs());
+ if (deopt_id() == Thread::kNoDeoptId) {
+ ASSERT(compiler->is_optimizing());
+ compiler->GenerateCall(token_pos(), *StubCode::AllocateArray_entry(),
+ RawPcDescriptors::kOther, locs());
+ } else {
+ compiler->GenerateCallWithDeopt(token_pos(), deopt_id(),
+ *StubCode::AllocateArray_entry(),
+ RawPcDescriptors::kOther, locs());
+ }
ASSERT(locs()->out(0).reg() == kResultReg);
}
« no previous file with comments | « runtime/vm/intermediate_language.cc ('k') | runtime/vm/intermediate_language_arm64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698