Fix disassembly redirection from stdout into a file.

svenpanne@chromium.org · svenpanne@chromium.org · commit be6e432898fe · 2014-08-28T07:30:58.000Z
Pass \n, \r and \t through OStream without escaping. BUG= R=svenpanne@chromium.org Review URL: https://codereview.chromium.org/458533002 Patch from Vyacheslav Egorov <vegorov@google.com>. git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23478 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
@@ -3500,7 +3500,7 @@ int HGraph::TraceInlinedFunction(
               shared->end_position() - shared->start_position() + 1;
           for (int i = 0; i < source_len; i++) {
             if (stream.HasMore()) {
-              os << AsUC16(stream.GetNext());
+              os << AsReversiblyEscapedUC16(stream.GetNext());
             }
           }
         }
diff --git a/src/objects.cc b/src/objects.cc
@@ -10923,7 +10923,10 @@ void Code::Disassemble(const char* name, OStream& os) {  // NOLINT
 
   os << "Instructions (size = " << instruction_size() << ")\n";
   // TODO(svenpanne) The Disassembler should use streams, too!
-  Disassembler::Decode(stdout, this);
+  {
+    CodeTracer::Scope trace_scope(GetIsolate()->GetCodeTracer());
+    Disassembler::Decode(trace_scope.file(), this);
+  }
   os << "\n";
 
   if (kind() == FUNCTION) {
diff --git a/src/ostreams.cc b/src/ostreams.cc
@@ -163,6 +163,16 @@ OFStream& OFStream::flush() {
 }
 
 
+OStream& operator<<(OStream& os, const AsReversiblyEscapedUC16& c) {
+  char buf[10];
+  const char* format = (0x20 <= c.value && c.value <= 0x7F) && (c.value != 0x52)
+                           ? "%c"
+                           : (c.value <= 0xff) ? "\\x%02x" : "\\u%04x";
+  snprintf(buf, sizeof(buf), format, c.value);
+  return os << buf;
+}
+
+
 OStream& operator<<(OStream& os, const AsUC16& c) {
   char buf[10];
   const char* format = (0x20 <= c.value && c.value <= 0x7F)
diff --git a/src/ostreams.h b/src/ostreams.h
@@ -117,13 +117,26 @@ class OFStream: public OStream {
 };
 
 
-// A wrapper to disambiguate uint16_t and uc16.
+// Wrappers to disambiguate uint16_t and uc16.
 struct AsUC16 {
   explicit AsUC16(uint16_t v) : value(v) {}
   uint16_t value;
 };
 
 
+struct AsReversiblyEscapedUC16 {
+  explicit AsReversiblyEscapedUC16(uint16_t v) : value(v) {}
+  uint16_t value;
+};
+
+
+// Writes the given character to the output escaping everything outside
+// of printable ASCII range. Additionally escapes '\' making escaping
+// reversible.
+OStream& operator<<(OStream& os, const AsReversiblyEscapedUC16& c);
+
+// Writes the given character to the output escaping everything outside
+// of printable ASCII range.
 OStream& operator<<(OStream& os, const AsUC16& c);
 } }  // namespace v8::internal
 

Original file line number	Diff line number	Diff line change
`@@ -3500,7 +3500,7 @@ int HGraph::TraceInlinedFunction(`
`3500`	`3500`	`shared->end_position() - shared->start_position() + 1;`
`3501`	`3501`	`for (int i = 0; i < source_len; i++) {`
`3502`	`3502`	`if (stream.HasMore()) {`
`3503`		`- os << AsUC16(stream.GetNext());`
	`3503`	`+ os << AsReversiblyEscapedUC16(stream.GetNext());`
`3504`	`3504`	`}`
`3505`	`3505`	`}`
`3506`	`3506`	`}`