Index: llvm/include/llvm/Support/GraphWriter.h
===================================================================
--- llvm/include/llvm/Support/GraphWriter.h
+++ llvm/include/llvm/Support/GraphWriter.h
@@ -86,8 +86,7 @@
     child_iterator EE = GTraits::child_end(Node);
     bool hasEdgeSourceLabels = false;
 
-    bool renderNodeUsingHTML = DTraits.renderNodeUsingHTML(Node);
-    if (renderNodeUsingHTML)
+    if (DTraits.renderNodeUsingHTML(Node))
       O << "</TR><TR>";
 
     for (unsigned i = 0; EI != EE && i != 64; ++EI, ++i) {
@@ -98,9 +97,8 @@
 
       hasEdgeSourceLabels = true;
 
-      if (renderNodeUsingHTML)
-        O << "<TD COLSPAN=\"1\" PORT=\"s" << i << "\">"
-          << label << "</TD>";
+      if (DTraits.renderNodeUsingHTML(Node))
+        O << "<TD COLSPAN=\"1\" PORT=\"s" << i << "\">" << label << "</TD>";
       else {
         if (i)
           O << "|";
@@ -110,7 +108,7 @@
     }
 
     if (EI != EE && hasEdgeSourceLabels) {
-      if (renderNodeUsingHTML)
+      if (DTraits.renderNodeUsingHTML(Node))
         O << "<TD COLSPAN=\"1\" PORT=\"s64\">truncated...</TD>";
       else
         O << "|<s64>truncated...";
@@ -178,9 +176,8 @@
   void writeNode(NodeRef Node) {
     std::string NodeAttributes = DTraits.getNodeAttributes(Node, G);
 
-    O << "\tNode" << static_cast<const void*>(Node) << " [shape=";
-    bool renderNodeUsingHTML = DTraits.renderNodeUsingHTML(Node);
-    if (renderNodeUsingHTML)
+    O << "\tNode" << static_cast<const void *>(Node) << " [shape=";
+    if (DTraits.renderNodeUsingHTML(Node))
       O << "none,";
     else
       O << "record,";
@@ -188,7 +185,7 @@
     if (!NodeAttributes.empty()) O << NodeAttributes << ",";
     O << "label=";
 
-    if (renderNodeUsingHTML) {
+    if (DTraits.renderNodeUsingHTML(Node)) {
       // Count the numbewr of edges out of the node to determine how
       // many columns to span (max 64)
       unsigned ColSpan = 0;
@@ -202,13 +199,13 @@
       if (EI != EE)
         ++ColSpan;
       O << "<<TABLE BORDER=\"0\" CELLBORDER=\"1\" CELLSPACING=\"0\""
-        << " CELLPADDING=\"0\"><TR><TD ALIGN=\"text\" COLSPAN=\""
-        << ColSpan << "\">";
+        << " CELLPADDING=\"0\"><TR><TD ALIGN=\"text\" COLSPAN=\"" << ColSpan
+        << "\">";
     } else
       O << "\"{";
 
     if (!DTraits.renderGraphFromBottomUp()) {
-      if (renderNodeUsingHTML)
+      if (DTraits.renderNodeUsingHTML(Node))
         O << DTraits.getNodeLabel(Node, G) << "</TD>";
       else
         O << DOT::EscapeString(DTraits.getNodeLabel(Node, G));
@@ -229,21 +226,21 @@
 
     if (hasEdgeSourceLabels) {
       if (!DTraits.renderGraphFromBottomUp())
-        if (!renderNodeUsingHTML)
+        if (!DTraits.renderNodeUsingHTML(Node))
           O << "|";
 
-      if (renderNodeUsingHTML)
+      if (DTraits.renderNodeUsingHTML(Node))
         O << EdgeSourceLabels.str();
       else
         O << "{" << EdgeSourceLabels.str() << "}";
 
       if (DTraits.renderGraphFromBottomUp())
-        if (!renderNodeUsingHTML)
+        if (!DTraits.renderNodeUsingHTML(Node))
           O << "|";
     }
 
     if (DTraits.renderGraphFromBottomUp()) {
-      if (renderNodeUsingHTML)
+      if (DTraits.renderNodeUsingHTML(Node))
         O << DTraits.getNodeLabel(Node, G);
       else
         O << DOT::EscapeString(DTraits.getNodeLabel(Node, G));
@@ -268,18 +265,17 @@
           << DOT::EscapeString(DTraits.getEdgeDestLabel(Node, i));
       }
 
-      if (renderNodeUsingHTML)
+      if (DTraits.renderNodeUsingHTML(Node))
         O << "<TD COLSPAN=\"1\">... truncated</TD>";
-      else
-        if (i != e)
-          O << "|<d64>truncated...}";
+      else if (i != e)
+        O << "|<d64>truncated...}";
     }
 
-    if (renderNodeUsingHTML)
+    if (DTraits.renderNodeUsingHTML(Node))
       O << "</TR></TABLE>>";
     else
       O << "}\"";
-    O << "];\n";   // Finish printing the "node" line
+    O << "];\n"; // Finish printing the "node" line
 
     // Output all of the edges now
     child_iterator EI = GTraits::child_begin(Node);