Resolve some disagreements between SIMARM and XARM on offsets used in compiled code.

runtime/vm/scavenger.h

 // Copyright (c) 2012, 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.
 
 #ifndef VM_SCAVENGER_H_
 #define VM_SCAVENGER_H_
 
 #include "platform/assert.h"
 #include "platform/utils.h"
 #include "vm/dart.h"
@@ skipping 254 matching lines @@
   }
   bool PromotedStackHasMore() const {
     ASSERT(scavenging_);
     return end_ < to_->end();
   }
 
   void ProcessWeakTables();
 
   intptr_t NewSizeInWords(intptr_t old_size_in_words) const;
 
-  SemiSpace* to_;
-
-  Heap* heap_;
-
   // Current allocation top and end. These values are being accessed directly
   // from generated code.
   uword top_;
   uword end_;
 
+  SemiSpace* to_;
+
+  Heap* heap_;
+
   // A pointer to the first unscanned object.  Scanning completes when
   // this value meets the allocation top.
   uword resolved_top_;
 
   // Objects below this address have survived a scavenge.
   uword survivor_end_;
 
   intptr_t max_semi_capacity_in_words_;
 
   // All object are aligned to this value.
@@ skipping 12 matching lines @@
 
   friend class ScavengerVisitor;
   friend class ScavengerWeakVisitor;
 
   DISALLOW_COPY_AND_ASSIGN(Scavenger);
 };
 
 }  // namespace dart
 
 #endif  // VM_SCAVENGER_H_