Merge "Type MoveOperands."

1 files changed, 8 insertions, 3 deletions

diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc
index 8736374306..f7fa5db8d5 100644
--- a/compiler/optimizing/code_generator.cc
+++ b/compiler/optimizing/code_generator.cc
@@ -802,10 +802,15 @@ void CodeGenerator::ClearSpillSlotsFromLoopPhisInStackMap(HSuspendCheck* suspend
   }
 }
 
-void CodeGenerator::EmitParallelMoves(Location from1, Location to1, Location from2, Location to2) {
+void CodeGenerator::EmitParallelMoves(Location from1,
+                                      Location to1,
+                                      Primitive::Type type1,
+                                      Location from2,
+                                      Location to2,
+                                      Primitive::Type type2) {
   HParallelMove parallel_move(GetGraph()->GetArena());
-  parallel_move.AddMove(from1, to1, nullptr);
-  parallel_move.AddMove(from2, to2, nullptr);
+  parallel_move.AddMove(from1, to1, type1, nullptr);
+  parallel_move.AddMove(from2, to2, type2, nullptr);
   GetMoveResolver()->EmitNativeCode(&parallel_move);
 }