diff --git a/include/llvm/Analysis/DSNode.h b/include/llvm/Analysis/DSNode.h index ce7f53be6b5..5d4fc742675 100644 --- a/include/llvm/Analysis/DSNode.h +++ b/include/llvm/Analysis/DSNode.h @@ -181,7 +181,8 @@ public: /// This method returns true if the node is completely folded, otherwise /// false. /// - bool mergeTypeInfo(const Type *Ty, unsigned Offset); + bool mergeTypeInfo(const Type *Ty, unsigned Offset, + bool FoldIfIncompatible = true); /// foldNodeCompletely - If we determine that this node has some funny /// behavior happening to it that we cannot represent, we fold it down to a diff --git a/include/llvm/Analysis/DataStructure/DSNode.h b/include/llvm/Analysis/DataStructure/DSNode.h index ce7f53be6b5..5d4fc742675 100644 --- a/include/llvm/Analysis/DataStructure/DSNode.h +++ b/include/llvm/Analysis/DataStructure/DSNode.h @@ -181,7 +181,8 @@ public: /// This method returns true if the node is completely folded, otherwise /// false. /// - bool mergeTypeInfo(const Type *Ty, unsigned Offset); + bool mergeTypeInfo(const Type *Ty, unsigned Offset, + bool FoldIfIncompatible = true); /// foldNodeCompletely - If we determine that this node has some funny /// behavior happening to it that we cannot represent, we fold it down to a