Fix size/offset assertion to allow negative offsets and folded nodes.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@13644 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/llvm/Analysis/DSNode.h b/include/llvm/Analysis/DSNode.h
index 3ddd29a..f1bb90e 100644
--- a/include/llvm/Analysis/DSNode.h
+++ b/include/llvm/Analysis/DSNode.h
@@ -386,7 +386,14 @@
// Define inline DSNodeHandle functions that depend on the definition of DSNode
//
inline DSNode *DSNodeHandle::getNode() const {
- assert((!N || Offset < N->Size || (N->Size == 0 && Offset == 0) ||
+ // Disabling this assertion because it is failing on a "magic" struct
+ // in named (from bind). The fourth field is an array of length 0,
+ // presumably used to create struct instances of different sizes.
+ assert((!N ||
+ N->isNodeCompletelyFolded() ||
+ (N->Size == 0 && Offset == 0) ||
+ (int(Offset) >= 0 && Offset < N->Size) ||
+ (int(Offset) < 0 && -int(Offset) < int(N->Size)) ||
N->isForwarding()) && "Node handle offset out of range!");
if (N == 0 || !N->isForwarding())
return N;
diff --git a/include/llvm/Analysis/DataStructure/DSNode.h b/include/llvm/Analysis/DataStructure/DSNode.h
index 3ddd29a..f1bb90e 100644
--- a/include/llvm/Analysis/DataStructure/DSNode.h
+++ b/include/llvm/Analysis/DataStructure/DSNode.h
@@ -386,7 +386,14 @@
// Define inline DSNodeHandle functions that depend on the definition of DSNode
//
inline DSNode *DSNodeHandle::getNode() const {
- assert((!N || Offset < N->Size || (N->Size == 0 && Offset == 0) ||
+ // Disabling this assertion because it is failing on a "magic" struct
+ // in named (from bind). The fourth field is an array of length 0,
+ // presumably used to create struct instances of different sizes.
+ assert((!N ||
+ N->isNodeCompletelyFolded() ||
+ (N->Size == 0 && Offset == 0) ||
+ (int(Offset) >= 0 && Offset < N->Size) ||
+ (int(Offset) < 0 && -int(Offset) < int(N->Size)) ||
N->isForwarding()) && "Node handle offset out of range!");
if (N == 0 || !N->isForwarding())
return N;