Title: [252279] tags/Safari-609.1.10.1/Source/_javascript_Core
Revision
252279
Author
alanc...@apple.com
Date
2019-11-08 16:51:36 -0800 (Fri, 08 Nov 2019)

Log Message

Cherry-pick r252006. rdar://problem/56840002

    Surpress ASAN in SamplingProfiler's FrameWalker::resetAtMachineFrame().
    https://bugs.webkit.org/show_bug.cgi?id=203819
    <rdar://problem/56840002>

    Reviewed by Saam Barati.

    * runtime/SamplingProfiler.cpp:
    (JSC::FrameWalker::resetAtMachineFrame):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@252006 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: tags/Safari-609.1.10.1/Source/_javascript_Core/ChangeLog (252278 => 252279)


--- tags/Safari-609.1.10.1/Source/_javascript_Core/ChangeLog	2019-11-09 00:51:34 UTC (rev 252278)
+++ tags/Safari-609.1.10.1/Source/_javascript_Core/ChangeLog	2019-11-09 00:51:36 UTC (rev 252279)
@@ -1,5 +1,33 @@
 2019-11-07  Alan Coon  <alanc...@apple.com>
 
+        Cherry-pick r252006. rdar://problem/56840002
+
+    Surpress ASAN in SamplingProfiler's FrameWalker::resetAtMachineFrame().
+    https://bugs.webkit.org/show_bug.cgi?id=203819
+    <rdar://problem/56840002>
+    
+    Reviewed by Saam Barati.
+    
+    * runtime/SamplingProfiler.cpp:
+    (JSC::FrameWalker::resetAtMachineFrame):
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@252006 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-11-04  Mark Lam  <mark....@apple.com>
+
+            Surpress ASAN in SamplingProfiler's FrameWalker::resetAtMachineFrame().
+            https://bugs.webkit.org/show_bug.cgi?id=203819
+            <rdar://problem/56840002>
+
+            Reviewed by Saam Barati.
+
+            * runtime/SamplingProfiler.cpp:
+            (JSC::FrameWalker::resetAtMachineFrame):
+
+2019-11-07  Alan Coon  <alanc...@apple.com>
+
         Cherry-pick r251978. rdar://problem/56840003
 
     LLIntGenerator should not allocate temporaries in between variables

Modified: tags/Safari-609.1.10.1/Source/_javascript_Core/runtime/SamplingProfiler.cpp (252278 => 252279)


--- tags/Safari-609.1.10.1/Source/_javascript_Core/runtime/SamplingProfiler.cpp	2019-11-09 00:51:34 UTC (rev 252278)
+++ tags/Safari-609.1.10.1/Source/_javascript_Core/runtime/SamplingProfiler.cpp	2019-11-09 00:51:36 UTC (rev 252279)
@@ -170,7 +170,7 @@
         }
 
         CodeBlock* codeBlock = m_callFrame->unsafeCodeBlock();
-        if (!codeBlock || m_callFrame->callee().isWasm())
+        if (!codeBlock || m_callFrame->unsafeCallee().isWasm())
             return;
 
         if (!isValidCodeBlock(codeBlock)) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to