Adjust the comment section of CreateSource to account for lines longer than 60

[lanza]

Summary

On rare occasions, the address, instruction and arguments of a line of
assembly in the CreateSource printout would reach > 60 characters. The
function would integer overflow and try to indent a line by 0xfff....

Change the calculated offset to be the maximum of 60 or
line_strm.str().size()

[lanza]

readd whitespace

[clayborg]

See inlined comments.

tools/lldb-vscode/JSONUtils.cpp

547–548 ↗

(On Diff #167819)

Should we add one to line_strm.str().size() to allow for a space before the comment starts?

[lanza]

tools/lldb-vscode/JSONUtils.cpp

547–548 ↗

(On Diff #167819)

The text appended at line 552 (" # ") seems to cover the need for this.

[lanza]

switch to std::max

lldb/trunk/tools/lldb-vscode/JSONUtils.cpp

 //===-- JSONUtils.cpp -------------------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
+#include <algorithm>
+
 #include "llvm/Support/FormatAdapters.h"
 
 #include "lldb/API/SBBreakpoint.h"
 #include "lldb/API/SBBreakpointLocation.h"
 #include "lldb/API/SBValue.h"
 #include "lldb/Host/PosixApi.h"
 
 #include "ExceptionBreakpoint.h"
for (size_t i = 0; i < num_insts; ++i) {
         spaces = 2;
       else if (inst_offset < 1000)
         spaces = 1;
       line.clear();
       llvm::raw_string_ostream line_strm(line);
       line_strm << llvm::formatv("{0:X+}: <{1}> {2} {3,12} {4}", inst_addr,
                                  inst_offset, llvm::fmt_repeat(' ', spaces),
                                  m, o);
-      const uint32_t comment_row = 60;
-      // If there is a comment append it starting at column 60
+
+      // If there is a comment append it starting at column 60 or after one
+      // space past the last char
+      const uint32_t comment_row = std::max(line_strm.str().size(), (size_t)60);
       if (c && c[0]) {
         if (line.size() < comment_row)
           line_strm.indent(comment_row - line_strm.str().size());
         line_strm << " # " << c;
       }
       src_strm << line_strm.str() << "\n";
       source.addr_to_line[inst_addr] = i + 1;
     }