[llvm-commits] CVS: llvm/lib/Target/X86/X86ISelPattern.cpp

[Chris Lattner]

Changes in directory llvm/lib/Target/X86:

X86ISelPattern.cpp updated: 1.68 -> 1.69
---
Log message:

Rely on the code in MatchAddress to do this work.  Otherwise we fail to
match (X+Y)+(Z << 1), because we match the X+Y first, consuming the index
register, then there is no place to put the Z.


---
Diffs of the changes:  (+13 -11)

Index: llvm/lib/Target/X86/X86ISelPattern.cpp
diff -u llvm/lib/Target/X86/X86ISelPattern.cpp:1.68 llvm/lib/Target/X86/X86ISelPattern.cpp:1.69
--- llvm/lib/Target/X86/X86ISelPattern.cpp:1.68	Mon Jan 17 19:06:26 2005
+++ llvm/lib/Target/X86/X86ISelPattern.cpp	Mon Jan 17 20:25:52 2005
@@ -1579,18 +1579,20 @@
 
     // See if we can codegen this as an LEA to fold operations together.
     if (N.getValueType() == MVT::i32) {
+      ExprMap.erase(N);
       X86ISelAddressMode AM;
-      if (!MatchAddress(Op0, AM) && !MatchAddress(Op1, AM)) {
-	// If this is not just an add, emit the LEA.  For a simple add (like
-	// reg+reg or reg+imm), we just emit an add.  It might be a good idea to
-	// leave this as LEA, then peephole it to 'ADD' after two address elim
-	// happens.
-        if (AM.Scale != 1 || AM.BaseType == X86ISelAddressMode::FrameIndexBase||
-            AM.GV || (AM.Base.Reg.Val && AM.IndexReg.Val && AM.Disp)) {
-          X86AddressMode XAM = SelectAddrExprs(AM);
-          addFullAddress(BuildMI(BB, X86::LEA32r, 4, Result), XAM);
-          return Result;
-        }
+      MatchAddress(N, AM);
+      ExprMap[N] = Result;
+
+      // If this is not just an add, emit the LEA.  For a simple add (like
+      // reg+reg or reg+imm), we just emit an add.  It might be a good idea to
+      // leave this as LEA, then peephole it to 'ADD' after two address elim
+      // happens.
+      if (AM.Scale != 1 || AM.BaseType == X86ISelAddressMode::FrameIndexBase||
+          AM.GV || (AM.Base.Reg.Val && AM.IndexReg.Val && AM.Disp)) {
+        X86AddressMode XAM = SelectAddrExprs(AM);
+        addFullAddress(BuildMI(BB, X86::LEA32r, 4, Result), XAM);
+        return Result;
       }
     }