<p dir="ltr">Hi Hans,</p>
<p dir="ltr">This patch fixes -data-info-line command for some cases. Could you merge it into 3.7 release branch?</p>
<p dir="ltr">- Ilia</p>
<div class="gmail_quote">On Jul 15, 2015 8:28 PM, "Dawn Perchik" <<a href="mailto:dawn@burble.org">dawn@burble.org</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dperchik<br>
Date: Wed Jul 15 12:25:01 2015<br>
New Revision: 242306<br>
<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D242306-26view-3Drev&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=MEqT8U_n7oNfuDW5NRbY3ZV384ZquXIYFPWmprwUdKM&m=rc6N7lWU3nAkLf0rQL7E441WypmpziPxnkLL-6isMzw&s=rVZUW8M77ar-smoGxZ451xKnAzgg8KHyi7RFgiF1Vfs&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=242306&view=rev</a><br>
Log:<br>
Fix -data-info-line when source includes column number.<br>
<br>
This fixes an off-by-one bug in CMICmdCmdDataInfoLine::Acknowledge.  Given:<br>
    LineEntry: \[0x0000000100000f37-0x0000000100000f45\): /path/to/file:123:1<br>
-data-info-line would report the line as 12, omitting the last digit.<br>
<br>
Reviewed by: ki.stfu, abidh<br>
Subscribers: lldb-commits<br>
Differential Revision: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__reviews.llvm.org_D11209&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=MEqT8U_n7oNfuDW5NRbY3ZV384ZquXIYFPWmprwUdKM&m=rc6N7lWU3nAkLf0rQL7E441WypmpziPxnkLL-6isMzw&s=4hDIfCYohvIjO34_FoefPofht4yWsXBkQuT6HRZzBKY&e=" rel="noreferrer" target="_blank">http://reviews.llvm.org/D11209</a><br>
<br>
Modified:<br>
    lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp<br>
<br>
Modified: lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_lldb_trunk_tools_lldb-2Dmi_MICmdCmdData.cpp-3Frev-3D242306-26r1-3D242305-26r2-3D242306-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=MEqT8U_n7oNfuDW5NRbY3ZV384ZquXIYFPWmprwUdKM&m=rc6N7lWU3nAkLf0rQL7E441WypmpziPxnkLL-6isMzw&s=ALj4RvRrwMAR2Y2525599kB1GFQVd5CI14X3b7Pxrdw&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp?rev=242306&r1=242305&r2=242306&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp (original)<br>
+++ lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp Wed Jul 15 12:25:01 2015<br>
@@ -1789,7 +1789,7 @@ CMICmdCmdDataInfoLine::Acknowledge(void)<br>
             //                                                                     ^ -- line<br>
             const size_t nLineStartPos = nFileEndPos + 1;<br>
             const size_t nLineEndPos = rLine.find(':', nLineStartPos);<br>
-            const size_t nLineLen = nLineEndPos != std::string::npos ? nLineEndPos - nLineStartPos - 1<br>
+            const size_t nLineLen = nLineEndPos != std::string::npos ? nLineEndPos - nLineStartPos<br>
                                                                      : std::string::npos;<br>
             const CMIUtilString strLine(rLine.substr(nLineStartPos, nLineLen).c_str());<br>
             const CMICmnMIValueConst miValueConst4(strLine);<br>
<br>
<br>
_______________________________________________<br>
lldb-commits mailing list<br>
<a href="mailto:lldb-commits@cs.uiuc.edu">lldb-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits" rel="noreferrer" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits</a><br>
</blockquote></div>