ARM port of r42723.

runtime/vm/flow_graph_compiler_arm.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_ARM.
 #if defined(TARGET_ARCH_ARM)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/ast_printer.h"
@@ skipping 1202 matching lines @@
     FATAL2("Edge counter increment length: %" Pd ", expected %" Pd "\n",
            actual,
            expected);
   }
 #endif  // DEBUG
 }
 
 
 int32_t FlowGraphCompiler::EdgeCounterIncrementSizeInBytes() {
   // Used by CodePatcher; so must be constant across all code in an isolate.
+  int32_t size = 3 * Instr::kInstrSize;
 #if defined(DEBUG)
-  return (VerifiedMemory::enabled() ? 42 : 19) * Instr::kInstrSize;
-#else
-  return 3 * Instr::kInstrSize;
+  size += 35 * Instr::kInstrSize;
 #endif  // DEBUG
+  if (VerifiedMemory::enabled()) {
+    size += 20 * Instr::kInstrSize;
+  }
+  return size;
 }
 
 
 void FlowGraphCompiler::EmitOptimizedInstanceCall(
     ExternalLabel* target_label,
     const ICData& ic_data,
     intptr_t argument_count,
     intptr_t deopt_id,
     intptr_t token_pos,
     LocationSummary* locs) {
@@ skipping 647 matching lines @@
   DRegister dreg = EvenDRegisterOf(reg);
   __ vldrd(dreg, Address(SP, kDoubleSize, Address::PostIndex));
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM