maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fixed a bug introduced by my last commit: TargetGlobalValues should key on 

GlobalValue * and index pair. Update getGlobalAddress() for symmetry.

llvm-svn: 24524
This commit is contained in:
Evan Cheng 2005-11-30 02:49:21 +00:00
parent 0e0de2f3f0
commit 11d61613af
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/include/llvm/CodeGen/SelectionDAG.h
View File

@ -109,9 +109,10 @@ public:
SDOperand getConstant(uint64_t Val, MVT::ValueType VT);
SDOperand getTargetConstant(uint64_t Val, MVT::ValueType VT);
SDOperand getConstantFP(double Val, MVT::ValueType VT);
SDOperand getGlobalAddress(const GlobalValue *GV, MVT::ValueType VT);
SDOperand getGlobalAddress(const GlobalValue *GV, MVT::ValueType VT,
int offset = 0);
SDOperand getTargetGlobalAddress(const GlobalValue *GV, MVT::ValueType VT,
int offset=0);
int offset = 0);
SDOperand getFrameIndex(int FI, MVT::ValueType VT);
SDOperand getTargetFrameIndex(int FI, MVT::ValueType VT);
SDOperand getConstantPool(Constant *C, MVT::ValueType VT);
@ -399,8 +400,8 @@ private:
std::map<std::pair<SDOperand, std::pair<SDOperand, MVT::ValueType> >,
SDNode *> Loads;
std::map<const GlobalValue*, SDNode*> GlobalValues;
std::map<const GlobalValue*, SDNode*> TargetGlobalValues;
std::map<std::pair<const GlobalValue*, int>, SDNode*> GlobalValues;
std::map<std::pair<const GlobalValue*, int>, SDNode*> TargetGlobalValues;
std::map<std::pair<uint64_t, MVT::ValueType>, SDNode*> Constants;
std::map<std::pair<uint64_t, MVT::ValueType>, SDNode*> TargetConstants;
std::map<std::pair<uint64_t, MVT::ValueType>, SDNode*> ConstantFPs;

20
llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
View File

@ -283,12 +283,18 @@ void SelectionDAG::RemoveNodeFromCSEMaps(SDNode *N) {
Erased = CondCodeNodes[cast<CondCodeSDNode>(N)->get()] != 0;
CondCodeNodes[cast<CondCodeSDNode>(N)->get()] = 0;
break;
case ISD::GlobalAddress:
Erased = GlobalValues.erase(cast<GlobalAddressSDNode>(N)->getGlobal());
case ISD::GlobalAddress: {
GlobalAddressSDNode *GN = cast<GlobalAddressSDNode>(N);
Erased = GlobalValues.erase(std::make_pair(GN->getGlobal(),
GN->getOffset()));
break;
case ISD::TargetGlobalAddress:
Erased =TargetGlobalValues.erase(cast<GlobalAddressSDNode>(N)->getGlobal());
}
case ISD::TargetGlobalAddress: {
GlobalAddressSDNode *GN = cast<GlobalAddressSDNode>(N);
Erased =TargetGlobalValues.erase(std::make_pair(GN->getGlobal(),
GN->getOffset()));
break;
}
case ISD::FrameIndex:
Erased = FrameIndices.erase(cast<FrameIndexSDNode>(N)->getIndex());
break;
@ -491,8 +497,8 @@ SDOperand SelectionDAG::getConstantFP(double Val, MVT::ValueType VT) {
SDOperand SelectionDAG::getGlobalAddress(const GlobalValue *GV,
MVT::ValueType VT) {
SDNode *&N = GlobalValues[GV];
MVT::ValueType VT, int offset) {
SDNode *&N = GlobalValues[std::make_pair(GV, offset)];
if (N) return SDOperand(N, 0);
N = new GlobalAddressSDNode(false, GV, VT);
AllNodes.push_back(N);
@ -501,7 +507,7 @@ SDOperand SelectionDAG::getGlobalAddress(const GlobalValue *GV,
SDOperand SelectionDAG::getTargetGlobalAddress(const GlobalValue *GV,
MVT::ValueType VT, int offset) {
SDNode *&N = TargetGlobalValues[GV];
SDNode *&N = TargetGlobalValues[std::make_pair(GV, offset)];
if (N) return SDOperand(N, 0);
N = new GlobalAddressSDNode(true, GV, VT, offset);
AllNodes.push_back(N);