Author: tbrethou Date: Thu Sep 13 20:41:09 2007 New Revision: 41945 URL: http://llvm.org/viewvc/llvm-project?rev=41945&view=rev Log: Merge from mainline for PR1652.
Modified: llvm/branches/release_21/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Modified: llvm/branches/release_21/lib/CodeGen/SelectionDAG/SelectionDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_21/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=41945&r1=41944&r2=41945&view=diff ============================================================================== --- llvm/branches/release_21/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original) +++ llvm/branches/release_21/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Thu Sep 13 20:41:09 2007 @@ -375,7 +375,7 @@ LoadSDNode *LD = cast<LoadSDNode>(N); ID.AddInteger(LD->getAddressingMode()); ID.AddInteger(LD->getExtensionType()); - ID.AddInteger(LD->getLoadedVT()); + ID.AddInteger((unsigned int)(LD->getLoadedVT())); ID.AddPointer(LD->getSrcValue()); ID.AddInteger(LD->getSrcValueOffset()); ID.AddInteger(LD->getAlignment()); @@ -386,7 +386,7 @@ StoreSDNode *ST = cast<StoreSDNode>(N); ID.AddInteger(ST->getAddressingMode()); ID.AddInteger(ST->isTruncatingStore()); - ID.AddInteger(ST->getStoredVT()); + ID.AddInteger((unsigned int)(ST->getStoredVT())); ID.AddPointer(ST->getSrcValue()); ID.AddInteger(ST->getSrcValueOffset()); ID.AddInteger(ST->getAlignment()); @@ -636,7 +636,7 @@ if (const LoadSDNode *LD = dyn_cast<LoadSDNode>(N)) { ID.AddInteger(LD->getAddressingMode()); ID.AddInteger(LD->getExtensionType()); - ID.AddInteger(LD->getLoadedVT()); + ID.AddInteger((unsigned int)(LD->getLoadedVT())); ID.AddPointer(LD->getSrcValue()); ID.AddInteger(LD->getSrcValueOffset()); ID.AddInteger(LD->getAlignment()); @@ -644,7 +644,7 @@ } else if (const StoreSDNode *ST = dyn_cast<StoreSDNode>(N)) { ID.AddInteger(ST->getAddressingMode()); ID.AddInteger(ST->isTruncatingStore()); - ID.AddInteger(ST->getStoredVT()); + ID.AddInteger((unsigned int)(ST->getStoredVT())); ID.AddPointer(ST->getSrcValue()); ID.AddInteger(ST->getSrcValueOffset()); ID.AddInteger(ST->getAlignment()); @@ -2253,7 +2253,7 @@ AddNodeIDNode(ID, ISD::LOAD, VTs, Ops, 3); ID.AddInteger(ISD::UNINDEXED); ID.AddInteger(ISD::NON_EXTLOAD); - ID.AddInteger(VT); + ID.AddInteger((unsigned int)VT); ID.AddPointer(SV); ID.AddInteger(SVOffset); ID.AddInteger(Alignment); @@ -2307,7 +2307,7 @@ AddNodeIDNode(ID, ISD::LOAD, VTs, Ops, 3); ID.AddInteger(ISD::UNINDEXED); ID.AddInteger(ExtType); - ID.AddInteger(EVT); + ID.AddInteger((unsigned int)EVT); ID.AddPointer(SV); ID.AddInteger(SVOffset); ID.AddInteger(Alignment); @@ -2335,7 +2335,7 @@ AddNodeIDNode(ID, ISD::LOAD, VTs, Ops, 3); ID.AddInteger(AM); ID.AddInteger(LD->getExtensionType()); - ID.AddInteger(LD->getLoadedVT()); + ID.AddInteger((unsigned int)(LD->getLoadedVT())); ID.AddPointer(LD->getSrcValue()); ID.AddInteger(LD->getSrcValueOffset()); ID.AddInteger(LD->getAlignment()); @@ -2376,7 +2376,7 @@ AddNodeIDNode(ID, ISD::STORE, VTs, Ops, 4); ID.AddInteger(ISD::UNINDEXED); ID.AddInteger(false); - ID.AddInteger(VT); + ID.AddInteger((unsigned int)VT); ID.AddPointer(SV); ID.AddInteger(SVOffset); ID.AddInteger(Alignment); @@ -2421,7 +2421,7 @@ AddNodeIDNode(ID, ISD::STORE, VTs, Ops, 4); ID.AddInteger(ISD::UNINDEXED); ID.AddInteger(isTrunc); - ID.AddInteger(SVT); + ID.AddInteger((unsigned int)SVT); ID.AddPointer(SV); ID.AddInteger(SVOffset); ID.AddInteger(Alignment); @@ -2448,7 +2448,7 @@ AddNodeIDNode(ID, ISD::STORE, VTs, Ops, 4); ID.AddInteger(AM); ID.AddInteger(ST->isTruncatingStore()); - ID.AddInteger(ST->getStoredVT()); + ID.AddInteger((unsigned int)(ST->getStoredVT())); ID.AddPointer(ST->getSrcValue()); ID.AddInteger(ST->getSrcValueOffset()); ID.AddInteger(ST->getAlignment()); _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits