Fixes for ARM/ARM64/MIPS parallel move resolver.

runtime/vm/flow_graph_compiler.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_FLOW_GRAPH_COMPILER_H_
 #define VM_FLOW_GRAPH_COMPILER_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/code_descriptors.h"
@@ skipping 43 matching lines @@
 
    private:
     ParallelMoveResolver* resolver_;
     Register reg_;
     bool spilled_;
   };
 
 
   bool IsScratchLocation(Location loc);
   intptr_t AllocateScratchRegister(Location::Kind kind,
-                                   intptr_t blocked,
+                                   uword blocked_mask,
                                    intptr_t first_free_register,
                                    intptr_t last_free_register,
                                    bool* spilled);
 
   void SpillScratch(Register reg);
   void RestoreScratch(Register reg);
   void SpillFpuScratch(FpuRegister reg);
   void RestoreFpuScratch(FpuRegister reg);
 
   // friend class ScratchXmmRegisterScope;
@@ skipping 14 matching lines @@
 
   // Verify the move list before performing moves.
   void Verify();
 
   // Helpers for non-trivial source-destination combinations that cannot
   // be handled by a single instruction.
   void MoveMemoryToMemory(const Address& dst, const Address& src);
   void StoreObject(const Address& dst, const Object& obj);
   void Exchange(Register reg, const Address& mem);
   void Exchange(const Address& mem1, const Address& mem2);
-  void Exchange(Register reg, intptr_t stack_offset);
-  void Exchange(intptr_t stack_offset1, intptr_t stack_offset2);
+  void Exchange(Register reg, Register base_reg, intptr_t stack_offset);
+  void Exchange(Register base_reg1,
+                intptr_t stack_offset1,
+                Register base_reg2,
+                intptr_t stack_offset2);
 
   FlowGraphCompiler* compiler_;
 
   // List of moves not yet resolved.
   GrowableArray<MoveOperands*> moves_;
 };
 
 
 // Used for describing a deoptimization point after call (lazy deoptimization).
 // For deoptimization before instruction use class CompilerDeoptInfoWithStub.
@@ skipping 527 matching lines @@
   intptr_t lazy_deopt_pc_offset_;
 
   ZoneGrowableArray<const ICData*>* deopt_id_to_ic_data_;
 
   DISALLOW_COPY_AND_ASSIGN(FlowGraphCompiler);
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_COMPILER_H_