Rename NewNode flag to HeapNode

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

5 files changed, 7 insertions, 6 deletions

diff --git a/include/llvm/Analysis/DSNode.h b/include/llvm/Analysis/DSNode.h
index 12d2cbc2bd..367c377a34 100644
--- a/include/llvm/Analysis/DSNode.h
+++ b/include/llvm/Analysis/DSNode.h
@@ -63,7 +63,7 @@ public:
   enum NodeTy {
     ShadowNode  = 0,        // Nothing is known about this node...
     AllocaNode  = 1 << 0,   // This node was allocated with alloca
-    NewNode     = 1 << 1,   // This node was allocated with malloc
+    HeapNode    = 1 << 1,   // This node was allocated with malloc
     GlobalNode  = 1 << 2,   // This node was allocated by a global var decl
     UnknownNode = 1 << 3,   // This node points to unknown allocated memory 
     Incomplete  = 1 << 4,   // This node may not be complete
diff --git a/include/llvm/Analysis/DataStructure/DSNode.h b/include/llvm/Analysis/DataStructure/DSNode.h
index 12d2cbc2bd..367c377a34 100644
--- a/include/llvm/Analysis/DataStructure/DSNode.h
+++ b/include/llvm/Analysis/DataStructure/DSNode.h
@@ -63,7 +63,7 @@ public:
   enum NodeTy {
     ShadowNode  = 0,        // Nothing is known about this node...
     AllocaNode  = 1 << 0,   // This node was allocated with alloca
-    NewNode     = 1 << 1,   // This node was allocated with malloc
+    HeapNode    = 1 << 1,   // This node was allocated with malloc
     GlobalNode  = 1 << 2,   // This node was allocated by a global var decl
     UnknownNode = 1 << 3,   // This node points to unknown allocated memory 
     Incomplete  = 1 << 4,   // This node may not be complete
diff --git a/lib/Analysis/DataStructure/DataStructure.cpp b/lib/Analysis/DataStructure/DataStructure.cpp
index 2aadc000f6..ac65d2ad76 100644
--- a/lib/Analysis/DataStructure/DataStructure.cpp
+++ b/lib/Analysis/DataStructure/DataStructure.cpp
@@ -1003,10 +1003,11 @@ void GlobalDSGraph::removeReference(const DSGraph* referrer) {
   }
 }
 
+#if 0
 // Bits used in the next function
-static const char ExternalTypeBits = DSNode::GlobalNode | DSNode::NewNode;
+static const char ExternalTypeBits = DSNode::GlobalNode | DSNode::HeapNode;
+
 
-#if 0
 // GlobalDSGraph::cloneNodeInto - Clone a global node and all its externally
 // visible target links (and recursively their such links) into this graph.
 // NodeCache maps the node being cloned to its clone in the Globals graph,
diff --git a/lib/Analysis/DataStructure/Local.cpp b/lib/Analysis/DataStructure/Local.cpp
index 0d6046d13d..e45cdcbed8 100644
--- a/lib/Analysis/DataStructure/Local.cpp
+++ b/lib/Analysis/DataStructure/Local.cpp
@@ -84,7 +84,7 @@ namespace {
   private:
     // Visitor functions, used to handle each instruction type we encounter...
     friend class InstVisitor<GraphBuilder>;
-    void visitMallocInst(MallocInst &MI) { handleAlloc(MI, DSNode::NewNode); }
+    void visitMallocInst(MallocInst &MI) { handleAlloc(MI, DSNode::HeapNode); }
     void visitAllocaInst(AllocaInst &AI) { handleAlloc(AI, DSNode::AllocaNode);}
     void handleAlloc(AllocationInst &AI, DSNode::NodeTy NT);
 
diff --git a/lib/Analysis/DataStructure/Printer.cpp b/lib/Analysis/DataStructure/Printer.cpp
index a58f7ef4ee..8514d53faf 100644
--- a/lib/Analysis/DataStructure/Printer.cpp
+++ b/lib/Analysis/DataStructure/Printer.cpp
@@ -37,7 +37,7 @@ static string getCaption(const DSNode *N, const DSGraph *G) {
   }
 
   if (N->NodeType & DSNode::AllocaNode ) OS << "S";
-  if (N->NodeType & DSNode::NewNode    ) OS << "H";
+  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";