Changeset 173550 in webkit

Timestamp:

Sep 11, 2014, 6:04:05 PM (12 years ago)

Author:

msaboff@apple.com

Message:

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• lldb/lldb_webkit.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+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):
+
 2014-09-11  Rebecca Hauck  <rhauck@adobe.com>
 

trunk/Tools/lldb/lldb_webkit.py

@@ -110 +110 @@
     thread = process.GetSelectedThread()
 
+    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"
+
     backtraceDepth = thread.GetNumFrames()
 
@@ -129 +137 @@
         function = frame.GetFunction()
 
-        if not frame or not frame.GetSymbol() or frame.GetSymbol().GetName() == "llint_entry":
+        if annotateJSFrames and not frame or not frame.GetSymbol() or frame.GetSymbol().GetName() == "llint_entry":
             callFrame = frame.GetSP()
-            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
+            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
 
 # FIXME: Provide support for the following types: