* Changes to make NodeType be private to DSNode.

* Add new MultiObject flag to DSNode which keeps track of whether or not
  multiple objects have been merged into the node, allowing must-alias info
  to be tracked.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6794 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 12 insertions, 9 deletions

diff --git a/lib/Analysis/DataStructure/Printer.cpp b/lib/Analysis/DataStructure/Printer.cpp
index 7f0bf5a512..9bde0b7e89 100644
--- a/lib/Analysis/DataStructure/Printer.cpp
+++ b/lib/Analysis/DataStructure/Printer.cpp
@@ -38,16 +38,19 @@ static std::string getCaption(const DSNode *N, const DSGraph *G) {
     if (N->isArray())
       OS << " array";
   }
-  if (N->NodeType) {
+  if (unsigned NodeType = N->getNodeFlags()) {
     OS << ": ";
-    if (N->NodeType & DSNode::AllocaNode ) OS << "S";
-    if (N->NodeType & DSNode::HeapNode   ) OS << "H";
-    if (N->NodeType & DSNode::GlobalNode ) OS << "G";
-    if (N->NodeType & DSNode::UnknownNode) OS << "U";
-    if (N->NodeType & DSNode::Incomplete ) OS << "I";
-    if (N->NodeType & DSNode::Modified   ) OS << "M";
-    if (N->NodeType & DSNode::Read       ) OS << "R";
-    if (N->NodeType & DSNode::DEAD       ) OS << "<dead>";
+    if (NodeType & DSNode::AllocaNode ) OS << "S";
+    if (NodeType & DSNode::HeapNode   ) OS << "H";
+    if (NodeType & DSNode::GlobalNode ) OS << "G";
+    if (NodeType & DSNode::UnknownNode) OS << "U";
+    if (NodeType & DSNode::Incomplete ) OS << "I";
+    if (NodeType & DSNode::Modified   ) OS << "M";
+    if (NodeType & DSNode::Read       ) OS << "R";
+    if (NodeType & DSNode::MultiObject) OS << "m";
+#ifndef NDEBUG
+    if (NodeType & DSNode::DEAD       ) OS << "<dead>";
+#endif
     OS << "\n";
   }