Title: [235102] trunk/Source/_javascript_Core
Revision
235102
Author
[email protected]
Date
2018-08-20 18:13:51 -0700 (Mon, 20 Aug 2018)

Log Message

Fix the LLInt so that btjs shows vmEntryToJavaScript instead of llintPCRangeStart for the entry frame.
https://bugs.webkit.org/show_bug.cgi?id=188769

Reviewed by Michael Saboff.

* llint/LowLevelInterpreter.asm:
- Just put an unused instruction between llintPCRangeStart and vmEntryToJavaScript
  so that libunwind doesn't get confused by the 2 labels pointing to the same
  code address.

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (235101 => 235102)


--- trunk/Source/_javascript_Core/ChangeLog	2018-08-21 00:50:06 UTC (rev 235101)
+++ trunk/Source/_javascript_Core/ChangeLog	2018-08-21 01:13:51 UTC (rev 235102)
@@ -1,3 +1,15 @@
+2018-08-20  Mark Lam  <[email protected]>
+
+        Fix the LLInt so that btjs shows vmEntryToJavaScript instead of llintPCRangeStart for the entry frame.
+        https://bugs.webkit.org/show_bug.cgi?id=188769
+
+        Reviewed by Michael Saboff.
+
+        * llint/LowLevelInterpreter.asm:
+        - Just put an unused instruction between llintPCRangeStart and vmEntryToJavaScript
+          so that libunwind doesn't get confused by the 2 labels pointing to the same
+          code address.
+
 2018-08-19  Carlos Garcia Campos  <[email protected]>
 
         [GLIB] Add API to throw exceptions using printf formatted strings

Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm (235101 => 235102)


--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm	2018-08-21 00:50:06 UTC (rev 235101)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm	2018-08-21 01:13:51 UTC (rev 235102)
@@ -1148,6 +1148,13 @@
     ret
 end
 
+# This break instruction is needed so that the synthesized llintPCRangeStart label
+# doesn't point to the exact same location as vmEntryToJavaScript which comes after it.
+# Otherwise, libunwind will report vmEntryToJavaScript as llintPCRangeStart in
+# stack traces.
+
+    break
+
 # stub to call into _javascript_ or Native functions
 # EncodedJSValue vmEntryToJavaScript(void* code, VM* vm, ProtoCallFrame* protoFrame)
 # EncodedJSValue vmEntryToNativeFunction(void* code, VM* vm, ProtoCallFrame* protoFrame)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to