diff --git a/lib/Target/ARM/ARMTargetTransformInfo.cpp b/lib/Target/ARM/ARMTargetTransformInfo.cpp
index 95481e042b935..1e6db8960a2b8 100644
--- a/lib/Target/ARM/ARMTargetTransformInfo.cpp
+++ b/lib/Target/ARM/ARMTargetTransformInfo.cpp
@@ -127,11 +127,8 @@ int ARMTTIImpl::getIntImmCost(unsigned Opcode, unsigned Idx, const APInt &Imm,
   }
 
   // xor a, -1 can always be folded to MVN
-  if (Opcode == Instruction::Xor) {
-    int64_t NegImm = Imm.getSExtValue();
-    if (NegImm == -1)
-      return 0;
-  }
+  if (Opcode == Instruction::Xor && Imm.isAllOnesValue())
+    return 0;
 
   return getIntImmCost(Imm, Ty);
 }
diff --git a/test/CodeGen/Thumb/mvn.ll b/test/CodeGen/Thumb/mvn.ll
index b556a5aa5a660..1e16effc25963 100644
--- a/test/CodeGen/Thumb/mvn.ll
+++ b/test/CodeGen/Thumb/mvn.ll
@@ -191,3 +191,32 @@ for.cond.cleanup:
   ret void
 }
 
+
+define void @test128(i128* %a) {
+; CHECK-LABEL: test128:
+; CHECK:         ldr r1, [r0, #4]
+; CHECK-NEXT:    ldr r2, .LCPI8_0
+; CHECK-NEXT:    eors r2, r1
+; CHECK-NEXT:    str r2, [r0, #4]
+; CHECK-NEXT:    ldr r1, [r0]
+; CHECK-NEXT:    ldr r2, .LCPI8_1
+; CHECK-NEXT:    eors r2, r1
+; CHECK-NEXT:    str r2, [r0]
+; CHECK-NEXT:    ldr r1, [r0, #8]
+; CHECK-NEXT:    ldr r2, .LCPI8_2
+; CHECK-NEXT:    eors r2, r1
+; CHECK-NEXT:    str r2, [r0, #8]
+; CHECK-NEXT:    bx lr
+; CHECK-NEXT:    .p2align 2
+; CHECK-NEXT:  .LCPI8_0:
+; CHECK-NEXT:    .long 4075008415
+; CHECK-NEXT:  .LCPI8_1:
+; CHECK-NEXT:    .long 2080661269
+; CHECK-NEXT:  .LCPI8_2:
+; CHECK-NEXT:    .long 6692605
+  %x = load i128, i128* %a
+  %xn = xor i128 %x, 123456789123456789123456789
+  store i128 %xn, i128* %a
+  ret void
+}
+