forked from OSchip/llvm-project
Make PointerSize & Shift be enums
Fix problem with recursive merging llvm-svn: 4570
This commit is contained in:
parent
075a8d7341
commit
2b79f4b7c3
|
@ -20,11 +20,6 @@ namespace {
|
|||
Statistic<> NumFolds("dsnode", "Number of nodes completely folded");
|
||||
};
|
||||
|
||||
namespace DS {
|
||||
const unsigned PointerShift = 3; // 64bit ptrs = 3, 32 bit ptrs = 2
|
||||
const unsigned PointerSize = 1 << PointerShift;
|
||||
};
|
||||
|
||||
namespace DataStructureAnalysis { // TODO: FIXME
|
||||
// isPointerType - Return true if this first class type is big enough to hold
|
||||
// a pointer.
|
||||
|
@ -392,7 +387,7 @@ void DSNode::mergeWith(const DSNodeHandle &NH, unsigned Offset) {
|
|||
}
|
||||
N = NH.getNode();
|
||||
|
||||
if (this == N) return;
|
||||
if (this == N || N == 0) return;
|
||||
|
||||
// If both nodes are not at offset 0, make sure that we are merging the node
|
||||
// at an later offset into the node with the zero offset.
|
||||
|
|
Loading…
Reference in New Issue