From 7fe79ff31358d00a47bb9ac1205c6e8fb1d71b72 Mon Sep 17 00:00:00 2001
From: David Brazdil <dbrazdil@google.com>
Date: Mon, 18 May 2015 13:57:11 +0000
Subject: Revert "ART: Revert change to LiveRange::Dump"

This reverts commit 294a0509cf811061b8009ade61e76a1f94e248b2.

Need to investigate a compilation error.

Change-Id: I62020f6e546c9faf5f4a2ed6cc1f7e1499c2fa30
---
 compiler/optimizing/graph_visualizer.cc | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'compiler/optimizing/graph_visualizer.cc')

diff --git a/compiler/optimizing/graph_visualizer.cc b/compiler/optimizing/graph_visualizer.cc
index 7c302a9c96..7ea1240c5e 100644
--- a/compiler/optimizing/graph_visualizer.cc
+++ b/compiler/optimizing/graph_visualizer.cc
@@ -42,18 +42,13 @@ static bool HasWhitespace(const char* str) {
 
 class StringList {
  public:
-  enum Format {
-    kArrayBrackets,
-    kSetBrackets,
-  };
-
   // Create an empty list
-  StringList(Format format = kArrayBrackets) : format_(format), is_empty_(true) {}
+  StringList() : is_empty_(true) {}
 
   // Construct StringList from a linked list. List element class T
   // must provide methods `GetNext` and `Dump`.
   template<class T>
-  explicit StringList(T* first_entry, Format format = kArrayBrackets) : StringList(format) {
+  explicit StringList(T* first_entry) : StringList() {
     for (T* current = first_entry; current != nullptr; current = current->GetNext()) {
       current->Dump(NewEntryStream());
     }
@@ -69,7 +64,6 @@ class StringList {
   }
 
  private:
-  Format format_;
   bool is_empty_;
   std::ostringstream sstream_;
 
@@ -77,12 +71,7 @@ class StringList {
 };
 
 std::ostream& operator<<(std::ostream& os, const StringList& list) {
-  if (list.format_ == StringList::kArrayBrackets) {
-    return os << "[" << list.sstream_.str() << "]";
-  } else {
-    DCHECK_EQ(list.format_, StringList::kSetBrackets);
-    return os << "{" << list.sstream_.str() << "}";
-  }
+  return os << "[" << list.sstream_.str() << "]";
 }
 
 /**
@@ -302,8 +291,7 @@ class HGraphVisualizerPrinter : public HGraphVisitor {
       StartAttributeStream("liveness") << instruction->GetLifetimePosition();
       if (instruction->HasLiveInterval()) {
         LiveInterval* interval = instruction->GetLiveInterval();
-        StartAttributeStream("ranges")
-            << StringList(interval->GetFirstRange(), StringList::kSetBrackets);
+        StartAttributeStream("ranges") << StringList(interval->GetFirstRange());
         StartAttributeStream("uses") << StringList(interval->GetFirstUse());
         StartAttributeStream("env_uses") << StringList(interval->GetFirstEnvironmentUse());
         StartAttributeStream("is_fixed") << interval->IsFixed();
-- 
cgit v1.2.3