forked from OSchip/llvm-project
It doesn't make sense for one side to be const, but not the other.
llvm-svn: 10952
This commit is contained in:
parent
e75ae61b47
commit
94f4b2a78b
|
@ -326,7 +326,7 @@ inline DSNode *DSNodeHandle::getNode() const {
|
|||
return HandleForwarding();
|
||||
}
|
||||
|
||||
inline void DSNodeHandle::setNode(DSNode *n) {
|
||||
inline void DSNodeHandle::setNode(DSNode *n) const {
|
||||
assert(!n || !n->getForwardNode() && "Cannot set node to a forwarded node!");
|
||||
if (N) N->NumReferrers--;
|
||||
N = n;
|
||||
|
@ -377,11 +377,14 @@ inline void DSNodeHandle::addEdgeTo(unsigned Off, const DSNodeHandle &Node) {
|
|||
/// mergeWith - Merge the logical node pointed to by 'this' with the node
|
||||
/// pointed to by 'N'.
|
||||
///
|
||||
inline void DSNodeHandle::mergeWith(const DSNodeHandle &Node) {
|
||||
if (N != 0)
|
||||
inline void DSNodeHandle::mergeWith(const DSNodeHandle &Node) const {
|
||||
if (!isNull())
|
||||
getNode()->mergeWith(Node, Offset);
|
||||
else // No node to merge with, so just point to Node
|
||||
*this = Node;
|
||||
else { // No node to merge with, so just point to Node
|
||||
Offset = 0;
|
||||
setNode(Node.getNode());
|
||||
Offset = Node.getOffset();
|
||||
}
|
||||
}
|
||||
|
||||
} // End llvm namespace
|
||||
|
|
|
@ -93,7 +93,7 @@ public:
|
|||
inline DSNode *getNode() const; // Defined inline in DSNode.h
|
||||
unsigned getOffset() const { return Offset; }
|
||||
|
||||
inline void setNode(DSNode *N); // Defined inline in DSNode.h
|
||||
inline void setNode(DSNode *N) const; // Defined inline in DSNode.h
|
||||
void setOffset(unsigned O) {
|
||||
//assert((!N || Offset < N->Size || (N->Size == 0 && Offset == 0) ||
|
||||
// !N->ForwardNH.isNull()) && "Node handle offset out of range!");
|
||||
|
@ -108,7 +108,7 @@ public:
|
|||
/// mergeWith - Merge the logical node pointed to by 'this' with the node
|
||||
/// pointed to by 'N'.
|
||||
///
|
||||
void mergeWith(const DSNodeHandle &N);
|
||||
void mergeWith(const DSNodeHandle &N) const;
|
||||
|
||||
// hasLink - Return true if there is a link at the specified offset...
|
||||
inline bool hasLink(unsigned Num) const;
|
||||
|
|
Loading…
Reference in New Issue