Write-barrier verification on ARM.

runtime/vm/code_patcher_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/code_patcher.h"
 
+#include "vm/flow_graph_compiler.h"
 #include "vm/instructions.h"
 #include "vm/object.h"
 
 namespace dart {
 
 RawArray* CodePatcher::GetClosureArgDescAt(uword return_address,
                                            const Code& code) {
   ASSERT(code.ContainsInstructionAt(return_address));
   CallPattern call(return_address, code);
   return call.ClosureArgumentsDescriptor();
@@ skipping 76 matching lines @@
 }
 
 
 // This class pattern matches on a load from the object pool.  Loading on
 // ARM is complicated because it can take four possible different forms.  We
 // match backwards from the end of the sequence so we can reuse the code for
 // matching object pool loads at calls.
 class EdgeCounter : public ValueObject {
  public:
   EdgeCounter(uword pc, const Code& code)
-      : end_(pc - kAdjust), object_pool_(Array::Handle(code.ObjectPool())) {
+      : end_(pc - FlowGraphCompiler::EdgeCounterIncrementSizeInBytes()),
+        object_pool_(Array::Handle(code.ObjectPool())) {
     // An IsValid predicate is complicated and duplicates the code in the
     // decoding function.  Instead we rely on decoding the pattern which
     // will assert partial validity.
   }
 
   RawObject* edge_counter() const {
     Register ignored;
     intptr_t index;
     InstructionPattern::DecodeLoadWordFromPool(end_, &ignored, &index);
     ASSERT(ignored == R0);
@@ skipping 15 matching lines @@
 
 RawObject* CodePatcher::GetEdgeCounterAt(uword pc, const Code& code) {
   ASSERT(code.ContainsInstructionAt(pc));
   EdgeCounter counter(pc, code);
   return counter.edge_counter();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM