<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173550] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173550">173550</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-09-11 18:04:05 -0700 (Thu, 11 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>lldb_webkit.py:btjs doesn't work with release builds
https://bugs.webkit.org/show_bug.cgi?id=136760
Reviewed by Jer Noble.
If we can't get a result calling JSC::ExecState::describeFrame(), try calling the
mangled name _ZN3JSC9ExecState13describeFrameEv. Also cleaned up the handling if
we can't get a valid result from trying either call. In that case, we fallback to
just showing the PC. Also added check for both entry points. If neither is found,
we issue a warning and output the stack trace without JavaScript annotations.
* lldb/lldb_webkit.py:
(btjs):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolslldblldb_webkitpy">trunk/Tools/lldb/lldb_webkit.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (173549 => 173550)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-09-12 00:40:09 UTC (rev 173549)
+++ trunk/Tools/ChangeLog 2014-09-12 01:04:05 UTC (rev 173550)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-09-11 Michael Saboff <msaboff@apple.com>
+
+ lldb_webkit.py:btjs doesn't work with release builds
+ https://bugs.webkit.org/show_bug.cgi?id=136760
+
+ Reviewed by Jer Noble.
+
+ If we can't get a result calling JSC::ExecState::describeFrame(), try calling the
+ mangled name _ZN3JSC9ExecState13describeFrameEv. Also cleaned up the handling if
+ we can't get a valid result from trying either call. In that case, we fallback to
+ just showing the PC. Also added check for both entry points. If neither is found,
+ we issue a warning and output the stack trace without JavaScript annotations.
+
+ * lldb/lldb_webkit.py:
+ (btjs):
+
</ins><span class="cx"> 2014-09-11 Rebecca Hauck <rhauck@adobe.com>
</span><span class="cx">
</span><span class="cx"> webkitpy test failures from import-w3c-tests
</span></span></pre></div>
<a id="trunkToolslldblldb_webkitpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/lldb/lldb_webkit.py (173549 => 173550)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/lldb/lldb_webkit.py 2014-09-12 00:40:09 UTC (rev 173549)
+++ trunk/Tools/lldb/lldb_webkit.py 2014-09-12 01:04:05 UTC (rev 173550)
</span><span class="lines">@@ -109,6 +109,14 @@
</span><span class="cx"> process = target.GetProcess()
</span><span class="cx"> thread = process.GetSelectedThread()
</span><span class="cx">
</span><ins>+ if target.FindFunctions("JSC::ExecState::describeFrame").GetSize() or target.FindFunctions("_ZN3JSC9ExecState13describeFrameEv").GetSize():
+ annotateJSFrames = True
+ else:
+ annotateJSFrames = False
+
+ if not annotateJSFrames:
+ print "Warning: Can't find JSC::ExecState::describeFrame() in executable to annotate JavaScript frames"
+
</ins><span class="cx"> backtraceDepth = thread.GetNumFrames()
</span><span class="cx">
</span><span class="cx"> if len(command) == 1:
</span><span class="lines">@@ -128,14 +136,17 @@
</span><span class="cx">
</span><span class="cx"> function = frame.GetFunction()
</span><span class="cx">
</span><del>- if not frame or not frame.GetSymbol() or frame.GetSymbol().GetName() == "llint_entry":
</del><ins>+ if annotateJSFrames and not frame or not frame.GetSymbol() or frame.GetSymbol().GetName() == "llint_entry":
</ins><span class="cx"> callFrame = frame.GetSP()
</span><del>- JSFrameDescription = frame.EvaluateExpression("((JSC::CallFrame*)0x%x)->describeFrame()" % frame.GetFP()).GetSummary()
- JSFrameDescription = string.strip(JSFrameDescription, '"')
- frameFormat = ' frame #{num}: {addr:' + addressFormat + '} {desc}'
- print frameFormat.format(num=frame.GetFrameID(), addr=frame.GetPC(), desc=JSFrameDescription)
- else:
- print ' %s' % frame
</del><ins>+ JSFrameDescription = frame.EvaluateExpression("((JSC::ExecState*)0x%x)->describeFrame()" % frame.GetFP()).GetSummary()
+ if not JSFrameDescription:
+ JSFrameDescription = frame.EvaluateExpression("(char*)_ZN3JSC9ExecState13describeFrameEv(0x%x)" % frame.GetFP()).GetSummary()
+ if JSFrameDescription:
+ JSFrameDescription = string.strip(JSFrameDescription, '"')
+ frameFormat = ' frame #{num}: {addr:' + addressFormat + '} {desc}'
+ print frameFormat.format(num=frame.GetFrameID(), addr=frame.GetPC(), desc=JSFrameDescription)
+ continue
+ print ' %s' % frame
</ins><span class="cx">
</span><span class="cx"> # FIXME: Provide support for the following types:
</span><span class="cx"> # def WTFVector_SummaryProvider(valobj, dict):
</span></span></pre>
</div>
</div>
</body>
</html>