* Eliminate Scalar node type (renumber other node types)

* Allow DSNodeHandle::mergeWith to work if a node handle isn't pointing to a node yet


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4487 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2002-11-02 00:11:12 +00:00
parent 7e9fea736d
commit 332043264e
2 changed files with 22 additions and 18 deletions

View File

@ -62,13 +62,12 @@ class DSNode {
public:
enum NodeTy {
ShadowNode = 0, // Nothing is known about this node...
ScalarNode = 1 << 0, // Scalar of the current function contains this value
AllocaNode = 1 << 1, // This node was allocated with alloca
NewNode = 1 << 2, // This node was allocated with malloc
GlobalNode = 1 << 3, // This node was allocated by a global var decl
Incomplete = 1 << 4, // This node may not be complete
Modified = 1 << 5, // This node is modified in this context
Read = 1 << 6, // This node is read in this context
AllocaNode = 1 << 0, // This node was allocated with alloca
NewNode = 1 << 1, // This node was allocated with malloc
GlobalNode = 1 << 2, // This node was allocated by a global var decl
Incomplete = 1 << 3, // This node may not be complete
Modified = 1 << 4, // This node is modified in this context
Read = 1 << 5, // This node is read in this context
};
/// NodeType - A union of the above bits. "Shadow" nodes do not add any flags
@ -294,8 +293,11 @@ inline void DSNodeHandle::addEdgeTo(unsigned LinkNo, const DSNodeHandle &Node) {
/// pointed to by 'N'.
///
inline void DSNodeHandle::mergeWith(const DSNodeHandle &Node) {
assert(N && "DSNodeHandle does not point to a node yet!");
N->mergeWith(Node, Offset);
if (N != 0)
N->mergeWith(Node, Offset);
else { // No node to merge with, so just point to Node
*this = Node;
}
}
#endif

View File

@ -62,13 +62,12 @@ class DSNode {
public:
enum NodeTy {
ShadowNode = 0, // Nothing is known about this node...
ScalarNode = 1 << 0, // Scalar of the current function contains this value
AllocaNode = 1 << 1, // This node was allocated with alloca
NewNode = 1 << 2, // This node was allocated with malloc
GlobalNode = 1 << 3, // This node was allocated by a global var decl
Incomplete = 1 << 4, // This node may not be complete
Modified = 1 << 5, // This node is modified in this context
Read = 1 << 6, // This node is read in this context
AllocaNode = 1 << 0, // This node was allocated with alloca
NewNode = 1 << 1, // This node was allocated with malloc
GlobalNode = 1 << 2, // This node was allocated by a global var decl
Incomplete = 1 << 3, // This node may not be complete
Modified = 1 << 4, // This node is modified in this context
Read = 1 << 5, // This node is read in this context
};
/// NodeType - A union of the above bits. "Shadow" nodes do not add any flags
@ -294,8 +293,11 @@ inline void DSNodeHandle::addEdgeTo(unsigned LinkNo, const DSNodeHandle &Node) {
/// pointed to by 'N'.
///
inline void DSNodeHandle::mergeWith(const DSNodeHandle &Node) {
assert(N && "DSNodeHandle does not point to a node yet!");
N->mergeWith(Node, Offset);
if (N != 0)
N->mergeWith(Node, Offset);
else { // No node to merge with, so just point to Node
*this = Node;
}
}
#endif