Hide addresses in traced code.

src/string-stream.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 149 matching lines @@
       break;
     }
     case 'f': case 'g': case 'G': case 'e': case 'E': {
       double value = current.data_.u_double_;
       EmbeddedVector<char, 28> formatted;
       OS::SNPrintF(formatted, temp.start(), value);
       Add(formatted.start());
       break;
     }
     case 'p': {
-      void* value = current.data_.u_pointer_;
-      EmbeddedVector<char, 20> formatted;
-      OS::SNPrintF(formatted, temp.start(), value);
-      Add(formatted.start());
+      if (FLAG_trace_code_addresses) {
+        void* value = current.data_.u_pointer_;

[Sven Panne, 2013/01/21 09:51:05]

I would prefer just a ternary ?: to calculate value (e.g. NULL when we don't
want to see the actual pointer) instead of the whole if/else.

[Massi, 2013/01/21 15:27:49]

The code would be more "linear" but the output would display "NULL pointers"
instead of "hidden values".
I would prefer to have the explicit "0xXXXXXXXX" string in the log so that
nobody will ever mistake it for a NULL.

+        EmbeddedVector<char, 20> formatted;
+        OS::SNPrintF(formatted, temp.start(), value);
+        Add(formatted.start());
+      } else {
+        Add("0xXXXXXXXX");
+      }
       break;
     }
     default:
       UNREACHABLE();
       break;
     }
   }
 
   // Verify that the buffer is 0-terminated
   ASSERT(buffer_[length_] == '\0');
@@ skipping 15 matching lines @@
     for (int i = 0; i < debug_object_cache->length(); i++) {
       if ((*debug_object_cache)[i] == o) {
         Add("#%d#", i);
         return;
       }
     }
     if (debug_object_cache->length() < kMentionedObjectCacheMaxSize) {
       Add("#%d#", debug_object_cache->length());
       debug_object_cache->Add(HeapObject::cast(o));
     } else {
-      Add("@%p", o);
+      if (FLAG_trace_code_addresses) {

[Sven Panne, 2013/01/21 09:51:05]

Do we really need this if we have the change above? It looks like this is
handled there already in an identical way.

[Massi, 2013/01/21 15:27:49]

Done.

+        Add("@%p", o);
+      } else {
+        Add("0xXXXXXXXX");
+      }
     }
   }
 }
 
 
 void StringStream::Add(const char* format) {
   Add(CStrVector(format));
 }
 
 
@@ skipping 363 matching lines @@
 
 // Only grow once to the maximum allowable size.
 char* NoAllocationStringAllocator::grow(unsigned* bytes) {
   ASSERT(size_ >= *bytes);
   *bytes = size_;
   return space_;
 }
 
 
 } }  // namespace v8::internal