Rollback of r16286 in trunk branch.

src/scopes.cc

Index: src/scopes.cc
diff --git a/src/scopes.cc b/src/scopes.cc
index e38e9037431588518ef781e44c9722987e45a384..e631332d5c37ca84c9d57dad36de060b9ef047c3 100644
--- a/src/scopes.cc
+++ b/src/scopes.cc
@@ -907,32 +907,26 @@ void Scope::Print(int n) {
   PrintF("%d heap slots\n", num_heap_slots_); }
 
   // Print locals.
+  Indent(n1, "// function var\n");
   if (function_ != NULL) {
-    Indent(n1, "// function var:\n");
     PrintVar(n1, function_->proxy()->var());
   }
 
-  if (temps_.length() > 0) {
-    Indent(n1, "// temporary vars:\n");
-    for (int i = 0; i < temps_.length(); i++) {
-      PrintVar(n1, temps_[i]);
-    }
+  Indent(n1, "// temporary vars\n");
+  for (int i = 0; i < temps_.length(); i++) {
+    PrintVar(n1, temps_[i]);
   }
 
-  if (internals_.length() > 0) {
-    Indent(n1, "// internal vars:\n");
-    for (int i = 0; i < internals_.length(); i++) {
-      PrintVar(n1, internals_[i]);
-    }
+  Indent(n1, "// internal vars\n");
+  for (int i = 0; i < internals_.length(); i++) {
+    PrintVar(n1, internals_[i]);
   }
 
-  if (variables_.Start() != NULL) {
-    Indent(n1, "// local vars:\n");
-    PrintMap(n1, &variables_);
-  }
+  Indent(n1, "// local vars\n");
+  PrintMap(n1, &variables_);
 
+  Indent(n1, "// dynamic vars\n");
   if (dynamics_ != NULL) {
-    Indent(n1, "// dynamic vars:\n");
     PrintMap(n1, dynamics_->GetMap(DYNAMIC));
     PrintMap(n1, dynamics_->GetMap(DYNAMIC_LOCAL));
     PrintMap(n1, dynamics_->GetMap(DYNAMIC_GLOBAL));