Remove support for the MultiObject flag, which was just fundamentally broken

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6839 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2003-06-22 03:03:24 +00:00
parent 797249bc13
commit 5bb8776ece
2 changed files with 10 additions and 32 deletions

View File

@ -7,9 +7,6 @@
#ifndef LLVM_ANALYSIS_DSNODE_H
#define LLVM_ANALYSIS_DSNODE_H
#include <assert.h>
#include "llvm/Analysis/DSSupport.h"
template<typename BaseType>
class DSNodeIterator; // Data structure graph traversal iterator
@ -74,9 +71,8 @@ public:
Read = 1 << 6, // This node is read in this context
Array = 1 << 7, // This node is treated like an array
MultiObject = 1 << 8, // This node represents > 1 object (may alias)
//#ifndef NDEBUG
DEAD = 1 << 9, // This node is dead and should not be pointed to
DEAD = 1 << 8, // This node is dead and should not be pointed to
//#endif
Composition = AllocaNode | HeapNode | GlobalNode | UnknownNode,
@ -250,13 +246,12 @@ public:
bool isRead() const { return NodeType & Read; }
bool isIncomplete() const { return NodeType & Incomplete; }
bool isMultiObject() const { return NodeType & MultiObject; }
bool isDeadNode() const { return NodeType & DEAD; }
DSNode *setAllocaNodeMarker() { return setCompositionMarker(AllocaNode); }
DSNode *setHeapNodeMarker() { return setCompositionMarker(HeapNode); }
DSNode *setGlobalNodeMarker() { return setCompositionMarker(GlobalNode); }
DSNode *setUnknownNodeMarker() { return setCompositionMarker(UnknownNode); }
DSNode *setAllocaNodeMarker() { NodeType |= AllocaNode; return this; }
DSNode *setHeapNodeMarker() { NodeType |= HeapNode; return this; }
DSNode *setGlobalNodeMarker() { NodeType |= GlobalNode; return this; }
DSNode *setUnknownNodeMarker() { NodeType |= UnknownNode; return this; }
DSNode *setIncompleteMarker() { NodeType |= Incomplete; return this; }
DSNode *setModifiedMarker() { NodeType |= Modified; return this; }
@ -297,12 +292,6 @@ public:
private:
friend class DSNodeHandle;
DSNode *setCompositionMarker(unsigned Marker) {
if (NodeType & Composition) Marker |= MultiObject;
NodeType |= Marker;
return this;
}
// static mergeNodes - Helper for mergeWith()
static void MergeNodes(DSNodeHandle& CurNodeH, DSNodeHandle& NH);
};

View File

@ -7,9 +7,6 @@
#ifndef LLVM_ANALYSIS_DSNODE_H
#define LLVM_ANALYSIS_DSNODE_H
#include <assert.h>
#include "llvm/Analysis/DSSupport.h"
template<typename BaseType>
class DSNodeIterator; // Data structure graph traversal iterator
@ -74,9 +71,8 @@ public:
Read = 1 << 6, // This node is read in this context
Array = 1 << 7, // This node is treated like an array
MultiObject = 1 << 8, // This node represents > 1 object (may alias)
//#ifndef NDEBUG
DEAD = 1 << 9, // This node is dead and should not be pointed to
DEAD = 1 << 8, // This node is dead and should not be pointed to
//#endif
Composition = AllocaNode | HeapNode | GlobalNode | UnknownNode,
@ -250,13 +246,12 @@ public:
bool isRead() const { return NodeType & Read; }
bool isIncomplete() const { return NodeType & Incomplete; }
bool isMultiObject() const { return NodeType & MultiObject; }
bool isDeadNode() const { return NodeType & DEAD; }
DSNode *setAllocaNodeMarker() { return setCompositionMarker(AllocaNode); }
DSNode *setHeapNodeMarker() { return setCompositionMarker(HeapNode); }
DSNode *setGlobalNodeMarker() { return setCompositionMarker(GlobalNode); }
DSNode *setUnknownNodeMarker() { return setCompositionMarker(UnknownNode); }
DSNode *setAllocaNodeMarker() { NodeType |= AllocaNode; return this; }
DSNode *setHeapNodeMarker() { NodeType |= HeapNode; return this; }
DSNode *setGlobalNodeMarker() { NodeType |= GlobalNode; return this; }
DSNode *setUnknownNodeMarker() { NodeType |= UnknownNode; return this; }
DSNode *setIncompleteMarker() { NodeType |= Incomplete; return this; }
DSNode *setModifiedMarker() { NodeType |= Modified; return this; }
@ -297,12 +292,6 @@ public:
private:
friend class DSNodeHandle;
DSNode *setCompositionMarker(unsigned Marker) {
if (NodeType & Composition) Marker |= MultiObject;
NodeType |= Marker;
return this;
}
// static mergeNodes - Helper for mergeWith()
static void MergeNodes(DSNodeHandle& CurNodeH, DSNodeHandle& NH);
};