[llvm-commits] [poolalloc] r128657 - /poolalloc/trunk/include/dsa/DSNode.h

[Arushi Aggarwal]

Author: aggarwa4
Date: Thu Mar 31 13:44:35 2011
New Revision: 128657

URL: http://llvm.org/viewvc/llvm-project?rev=128657&view=rev
Log:
Consistently name DSNodeHandles as NH

Modified:
    poolalloc/trunk/include/dsa/DSNode.h

Modified: poolalloc/trunk/include/dsa/DSNode.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/dsa/DSNode.h?rev=128657&r1=128656&r2=128657&view=diff
==============================================================================
--- poolalloc/trunk/include/dsa/DSNode.h (original)
+++ poolalloc/trunk/include/dsa/DSNode.h Thu Mar 31 13:44:35 2011
@@ -14,16 +14,18 @@
 #ifndef LLVM_ANALYSIS_DSNODE_H
 #define LLVM_ANALYSIS_DSNODE_H
 
-#include "dsa/DSSupport.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/ilist_node.h"
-
-#include <map>
-#include <set>
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/raw_ostream.h"
 #include "dsa/svset.h"
 #include "dsa/super_set.h"
 #include "dsa/keyiterator.h"
 #include "dsa/DSGraph.h"
+#include "dsa/DSSupport.h"
+
+#include <map>
+#include <set>
 
 namespace llvm {
 
@@ -237,7 +239,6 @@
   /// completely (and return true) if the information is incompatible with what
   /// is already known.
   ///
-  /// FIXME: description
   void mergeTypeInfo(const Type *Ty, unsigned Offset);
   void mergeTypeInfo(const TyMapTy::mapped_type TyIt, unsigned Offset);
   void mergeTypeInfo(const DSNode* D, unsigned Offset);
@@ -495,21 +496,21 @@
 /// addEdgeTo - Add an edge from the current node to the specified node.  This
 /// can cause merging of nodes in the graph.
 ///
-inline void DSNodeHandle::addEdgeTo(unsigned Off, const DSNodeHandle &Node) {
+inline void DSNodeHandle::addEdgeTo(unsigned Off, const DSNodeHandle &NH) {
   assert(N && "DSNodeHandle does not point to a node yet!");
-  getNode()->addEdgeTo(Off+Offset, Node);
+  getNode()->addEdgeTo(Off+Offset, NH);
 }
 
 /// mergeWith - Merge the logical node pointed to by 'this' with the node
 /// pointed to by 'N'.
 ///
-inline void DSNodeHandle::mergeWith(const DSNodeHandle &Node) const {
+inline void DSNodeHandle::mergeWith(const DSNodeHandle &NH) const {
   if (!isNull())
-    getNode()->mergeWith(Node, Offset);
+    getNode()->mergeWith(NH, Offset);
   else {   // No node to merge with, so just point to Node
     Offset = 0;
-    DSNode *NN = Node.getNode();
-    setTo(NN, Node.getOffset());
+    DSNode *N = NH.getNode();
+    setTo(N, NH.getOffset());
   }
 }