Duncan is nervous about undefinedness of % with negatives.  I'm
not thrilled about 64-bit % in general, so rewrite to use * instead.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@62047 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp
index b6604a9..4921531 100644
--- a/lib/Transforms/Scalar/InstructionCombining.cpp
+++ b/lib/Transforms/Scalar/InstructionCombining.cpp
@@ -7710,7 +7710,7 @@
   int64_t FirstIdx = 0;
   if (int64_t TySize = TD->getABITypeSize(Ty)) {
     FirstIdx = Offset/TySize;
-    Offset %= TySize;
+    Offset -= FirstIdx*TySize;
     
     // Handle hosts where % returns negative instead of values [0..TySize).
     if (Offset < 0) {