--- a/js/src/jit/MIR.cpp
+++ b/js/src/jit/MIR.cpp
@@ -2656,18 +2656,16 @@ static inline bool NeedNegativeZeroCheck
         MDefinition* rhs = use_def->toSub()->rhs();
         if (rhs->id() < lhs->id() && CanProduceNegativeZero(lhs)) {
           return true;
         }
 
         MOZ_FALLTHROUGH;
       }
       case MDefinition::Opcode::StoreElement:
-      case MDefinition::Opcode::StoreElementHole:
-      case MDefinition::Opcode::FallibleStoreElement:
       case MDefinition::Opcode::LoadElement:
       case MDefinition::Opcode::LoadElementHole:
       case MDefinition::Opcode::LoadUnboxedScalar:
       case MDefinition::Opcode::LoadTypedArrayElementHole:
       case MDefinition::Opcode::CharCodeAt:
       case MDefinition::Opcode::Mod:
         // Only allowed to remove check when definition is the second operand
         if (use_def->getOperand(0) == def) {
@@ -2692,16 +2690,28 @@ static inline bool NeedNegativeZeroCheck
       case MDefinition::Opcode::Compare:
       case MDefinition::Opcode::BitAnd:
       case MDefinition::Opcode::BitOr:
       case MDefinition::Opcode::BitXor:
       case MDefinition::Opcode::Abs:
       case MDefinition::Opcode::TruncateToInt32:
         // Always allowed to remove check. No matter which operand.
         break;
+      case MDefinition::Opcode::StoreElementHole:
+      case MDefinition::Opcode::FallibleStoreElement:
+        // Only allowed to remove check when definition is the third operand.
+        for (size_t i = 0, e = use_def->numOperands(); i < e; i++) {
+          if (i == 2) {
+            continue;
+          }
+          if (use_def->getOperand(i) == def) {
+            return true;
+          }
+        }
+        break;
       default:
         return true;
     }
   }
   return false;
 }
 
 #ifdef JS_JITSPEW