Match index adds as well as base

src/IceTargetLoweringX86BaseImpl.h

 //===- subzero/src/IceTargetLoweringX86BaseImpl.h - x86 lowering -*- C++ -*-==//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 4506 matching lines @@
       //   swap(Index,Base)
       // Similar for Base=Const*Var and Base=Var<<Const
       if ((Shift == 0) && matchShiftedIndex(VMetadata, Base, Shift, Reason)) {
         std::swap(Base, Index);
         continue;
       }
     }
     // Update Offset to reflect additions/subtractions with constants and
     // relocatables.
     // TODO: consider overflow issues with respect to Offset.
-    // TODO: handle symbolic constants.
     if (matchOffsetBase(VMetadata, Base, Relocatable, Offset, Reason))
       continue;
+    if (Shift == 0 &&

[Jim Stichnoth, 2015/11/04 21:25:11]

This "Shift == 0" is inconsistent with "(Shift == 0)" above.  Make them
consistent?  (I personally prefer without parentheses here.)

[sehr, 2015/11/04 22:44:43]

Removed, as suggested.

+        matchOffsetBase(VMetadata, Index, Relocatable, Offset, Reason))
+      continue;
     // TODO(sehr, stichnot): Handle updates of Index with Shift != 0.
     // Index is Index=Var+Const ==>
     //   set Index=Var, Offset+=(Const<<Shift)
     // Index is Index=Const+Var ==>
     //   set Index=Var, Offset+=(Const<<Shift)
     // Index is Index=Var-Const ==>
     //   set Index=Var, Offset-=(Const<<Shift)
     break;
   } while (Reason);
   return AddressWasOptimized;
@@ skipping 1318 matching lines @@
   }
   // the offset is not eligible for blinding or pooling, return the original
   // mem operand
   return MemOperand;
 }
 
 } // end of namespace X86Internal
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICETARGETLOWERINGX86BASEIMPL_H