--- a/js/src/jit/MoveResolver.cpp
+++ b/js/src/jit/MoveResolver.cpp
@@ -184,21 +184,36 @@ bool MoveResolver::resolve() {
   // but the algorithm below assumes that every register can participate
   // in at most one cycle. To satisfy the algorithm, any double registers
   // that may conflict are split into their single-register halves.
   //
   // This logic is only applicable because ARM only uses registers d0-d15,
   // all of which alias s0-s31. Double registers d16-d31 are unused.
   // Therefore there is never a double move that cannot be split.
   // If this changes in the future, the algorithm will have to be fixed.
+
+  bool splitDoubles = false;
   for (auto iter = pending_.begin(); iter != pending_.end(); ++iter) {
     PendingMove* pm = *iter;
 
     if (isDoubleAliasedAsSingle(pm->from()) ||
         isDoubleAliasedAsSingle(pm->to())) {
+      splitDoubles = true;
+      break;
+    }
+  }
+
+  if (splitDoubles) {
+    for (auto iter = pending_.begin(); iter != pending_.end(); ++iter) {
+      PendingMove *pm = *iter;
+
+      if (!MoveIsDouble(pm->from()) && !MoveIsDouble(pm->to())) {
+        continue;
+      }
+
       MoveOperand fromLower = SplitIntoLowerHalf(pm->from());
       MoveOperand toLower = SplitIntoLowerHalf(pm->to());
 
       PendingMove* lower =
           movePool_.allocate(fromLower, toLower, MoveOp::FLOAT32);
       if (!lower) {
         return false;
       }