Revert "Shuffle around deopt id allocation to give the flow graph builder a chance to record other …

runtime/vm/intermediate_language_arm.cc

Index: runtime/vm/intermediate_language_arm.cc
diff --git a/runtime/vm/intermediate_language_arm.cc b/runtime/vm/intermediate_language_arm.cc
index ad21c9f89d50c2948ad3ceff773cc23041d214e9..0e350346f1cacf75d6b2f94e7fee0f40fbf5fd14 100644
--- a/runtime/vm/intermediate_language_arm.cc
+++ b/runtime/vm/intermediate_language_arm.cc
@@ -2485,15 +2485,9 @@ void CreateArrayInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   const Code& stub = Code::ZoneHandle(compiler->zone(),
                                       StubCode::AllocateArray_entry()->code());
   compiler->AddStubCallTarget(stub);
-  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());
-  }
+  compiler->GenerateCallWithDeopt(token_pos(), deopt_id(),
+                                  *StubCode::AllocateArray_entry(),
+                                  RawPcDescriptors::kOther, locs());
   ASSERT(locs()->out(0).reg() == kResultReg);
 }