[llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp SelectionDAGCSEMap.cpp

[Chris Lattner]

Changes in directory llvm/lib/CodeGen/SelectionDAG:

SelectionDAG.cpp updated: 1.325 -> 1.326
SelectionDAGCSEMap.cpp updated: 1.5 -> 1.6
---
Log message:

Add the actual constant to the hash for ConstantPool nodes.  Thanks to 
Rafael Espindola for pointing this out.


---
Diffs of the changes:  (+2 -0)

 SelectionDAG.cpp       |    1 +
 SelectionDAGCSEMap.cpp |    1 +
 2 files changed, 2 insertions(+)


Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp:1.325 llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp:1.326
--- llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp:1.325	Fri Aug 11 16:55:30 2006
+++ llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp	Mon Aug 14 15:12:44 2006
@@ -583,6 +583,7 @@
   SelectionDAGCSEMap::NodeID ID(Opc, getNodeValueTypes(VT));
   ID.AddInteger(Alignment);
   ID.AddInteger(Offset);
+  ID.AddPointer(C);
   void *IP = 0;
   if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))
     return SDOperand(E, 0);


Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAGCSEMap.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/SelectionDAGCSEMap.cpp:1.5 llvm/lib/CodeGen/SelectionDAG/SelectionDAGCSEMap.cpp:1.6
--- llvm/lib/CodeGen/SelectionDAG/SelectionDAGCSEMap.cpp:1.5	Fri Aug 11 20:07:10 2006
+++ llvm/lib/CodeGen/SelectionDAG/SelectionDAGCSEMap.cpp	Mon Aug 14 15:12:44 2006
@@ -64,6 +64,7 @@
     case ISD::TargetConstantPool:
       AddInteger(cast<ConstantPoolSDNode>(N)->getAlignment());
       AddInteger(cast<ConstantPoolSDNode>(N)->getOffset());
+      AddPointer(cast<ConstantPoolSDNode>(N)->get());
       break;
     }
   }