<!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>[282569] branches/safari-612-branch/Source</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/282569">282569</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2021-09-16 11:48:10 -0700 (Thu, 16 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/281544">r281544</a>. rdar://problem/83183832

    Refactor ENABLE(JIT_OPERATION_VALIDATION) code to emit no code when disabled.
    https://bugs.webkit.org/show_bug.cgi?id=229482
    rdar://82318317

    Reviewed by Yusuke Suzuki.

    Source/JavaScriptCore:

    * assembler/JITOperationList.cpp:
    (JSC::addPointers):
    (JSC::JITOperationList::populatePointersInJavaScriptCore):
    (JSC::JITOperationList::populatePointersInJavaScriptCoreForLLInt):
    (JSC::JITOperationList::populatePointersInEmbedder):
    * assembler/JITOperationList.h:
    (JSC::JITOperationList::map const):
    (JSC::JITOperationList::assertIsJITOperation):
    (JSC::JITOperationList::initialize):
    (JSC::JITOperationList::populatePointersInJavaScriptCore):
    (JSC::JITOperationList::populatePointersInJavaScriptCoreForLLInt):
    * runtime/JSCPtrTag.h:
    (JSC::tagJSCCodePtrImpl):
    (JSC::untagJSCCodePtrImpl):

    Source/WebCore:

    * bindings/js/WebCoreJITOperations.cpp:
    (WebCore::populateJITOperations):
    * bindings/js/WebCoreJITOperations.h:
    (WebCore::populateJITOperations):
    * testing/js/WebCoreTestSupport.cpp:
    (WebCoreTestSupport::populateJITOperations):
    * testing/js/WebCoreTestSupport.h:
    (WebCoreTestSupport::populateJITOperations):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281544 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari612branchSourceJavaScriptCoreChangeLog">branches/safari-612-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceJavaScriptCoreassemblerJITOperationListcpp">branches/safari-612-branch/Source/JavaScriptCore/assembler/JITOperationList.cpp</a></li>
<li><a href="#branchessafari612branchSourceJavaScriptCoreassemblerJITOperationListh">branches/safari-612-branch/Source/JavaScriptCore/assembler/JITOperationList.h</a></li>
<li><a href="#branchessafari612branchSourceJavaScriptCoreruntimeJSCPtrTagh">branches/safari-612-branch/Source/JavaScriptCore/runtime/JSCPtrTag.h</a></li>
<li><a href="#branchessafari612branchSourceWebCoreChangeLog">branches/safari-612-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceWebCorebindingsjsWebCoreJITOperationscpp">branches/safari-612-branch/Source/WebCore/bindings/js/WebCoreJITOperations.cpp</a></li>
<li><a href="#branchessafari612branchSourceWebCorebindingsjsWebCoreJITOperationsh">branches/safari-612-branch/Source/WebCore/bindings/js/WebCoreJITOperations.h</a></li>
<li><a href="#branchessafari612branchSourceWebCoretestingjsWebCoreTestSupportcpp">branches/safari-612-branch/Source/WebCore/testing/js/WebCoreTestSupport.cpp</a></li>
<li><a href="#branchessafari612branchSourceWebCoretestingjsWebCoreTestSupporth">branches/safari-612-branch/Source/WebCore/testing/js/WebCoreTestSupport.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari612branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/JavaScriptCore/ChangeLog (282568 => 282569)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/JavaScriptCore/ChangeLog       2021-09-16 18:48:05 UTC (rev 282568)
+++ branches/safari-612-branch/Source/JavaScriptCore/ChangeLog  2021-09-16 18:48:10 UTC (rev 282569)
</span><span class="lines">@@ -1,5 +1,70 @@
</span><span class="cx"> 2021-09-16  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r281544. rdar://problem/83183832
+
+    Refactor ENABLE(JIT_OPERATION_VALIDATION) code to emit no code when disabled.
+    https://bugs.webkit.org/show_bug.cgi?id=229482
+    rdar://82318317
+    
+    Reviewed by Yusuke Suzuki.
+    
+    Source/JavaScriptCore:
+    
+    * assembler/JITOperationList.cpp:
+    (JSC::addPointers):
+    (JSC::JITOperationList::populatePointersInJavaScriptCore):
+    (JSC::JITOperationList::populatePointersInJavaScriptCoreForLLInt):
+    (JSC::JITOperationList::populatePointersInEmbedder):
+    * assembler/JITOperationList.h:
+    (JSC::JITOperationList::map const):
+    (JSC::JITOperationList::assertIsJITOperation):
+    (JSC::JITOperationList::initialize):
+    (JSC::JITOperationList::populatePointersInJavaScriptCore):
+    (JSC::JITOperationList::populatePointersInJavaScriptCoreForLLInt):
+    * runtime/JSCPtrTag.h:
+    (JSC::tagJSCCodePtrImpl):
+    (JSC::untagJSCCodePtrImpl):
+    
+    Source/WebCore:
+    
+    * bindings/js/WebCoreJITOperations.cpp:
+    (WebCore::populateJITOperations):
+    * bindings/js/WebCoreJITOperations.h:
+    (WebCore::populateJITOperations):
+    * testing/js/WebCoreTestSupport.cpp:
+    (WebCoreTestSupport::populateJITOperations):
+    * testing/js/WebCoreTestSupport.h:
+    (WebCoreTestSupport::populateJITOperations):
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281544 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-08-24  Mark Lam  <mark.lam@apple.com>
+
+            Refactor ENABLE(JIT_OPERATION_VALIDATION) code to emit no code when disabled.
+            https://bugs.webkit.org/show_bug.cgi?id=229482
+            rdar://82318317
+
+            Reviewed by Yusuke Suzuki.
+
+            * assembler/JITOperationList.cpp:
+            (JSC::addPointers):
+            (JSC::JITOperationList::populatePointersInJavaScriptCore):
+            (JSC::JITOperationList::populatePointersInJavaScriptCoreForLLInt):
+            (JSC::JITOperationList::populatePointersInEmbedder):
+            * assembler/JITOperationList.h:
+            (JSC::JITOperationList::map const):
+            (JSC::JITOperationList::assertIsJITOperation):
+            (JSC::JITOperationList::initialize):
+            (JSC::JITOperationList::populatePointersInJavaScriptCore):
+            (JSC::JITOperationList::populatePointersInJavaScriptCoreForLLInt):
+            * runtime/JSCPtrTag.h:
+            (JSC::tagJSCCodePtrImpl):
+            (JSC::untagJSCCodePtrImpl):
+
+2021-09-16  Russell Epstein  <repstein@apple.com>
+
</ins><span class="cx">         Cherry-pick r281541. rdar://problem/83183498
</span><span class="cx"> 
</span><span class="cx">     [Re-landing] Add some offlineasm enhancements.
</span></span></pre></div>
<a id="branchessafari612branchSourceJavaScriptCoreassemblerJITOperationListcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/JavaScriptCore/assembler/JITOperationList.cpp (282568 => 282569)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/JavaScriptCore/assembler/JITOperationList.cpp  2021-09-16 18:48:05 UTC (rev 282568)
+++ branches/safari-612-branch/Source/JavaScriptCore/assembler/JITOperationList.cpp     2021-09-16 18:48:10 UTC (rev 282569)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2020 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2020-2021 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -36,12 +36,12 @@
</span><span class="cx"> 
</span><span class="cx"> namespace JSC {
</span><span class="cx"> 
</span><ins>+#if ENABLE(JIT_OPERATION_VALIDATION)
+
</ins><span class="cx"> LazyNeverDestroyed<JITOperationList> jitOperationList;
</span><span class="cx"> 
</span><del>-#if ENABLE(JIT_OPERATION_VALIDATION)
</del><span class="cx"> extern const uintptr_t startOfJITOperationsInJSC __asm("section$start$__DATA_CONST$__jsc_ops");
</span><span class="cx"> extern const uintptr_t endOfJITOperationsInJSC __asm("section$end$__DATA_CONST$__jsc_ops");
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> void JITOperationList::initialize()
</span><span class="cx"> {
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx">     jitOperationList.construct();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(JIT_OPERATION_VALIDATION)
</del><span class="cx"> static SUPPRESS_ASAN ALWAYS_INLINE void addPointers(HashMap<void*, void*>& map, const uintptr_t* beginOperations, const uintptr_t* endOperations)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(JIT_CAGE)
</span><span class="lines">@@ -65,22 +64,18 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> void JITOperationList::populatePointersInJavaScriptCore()
</span><span class="cx"> {
</span><del>-#if ENABLE(JIT_OPERATION_VALIDATION)
</del><span class="cx">     static std::once_flag onceKey;
</span><span class="cx">     std::call_once(onceKey, [] {
</span><span class="cx">         if (Options::useJIT())
</span><span class="cx">             addPointers(jitOperationList->m_validatedOperations, &startOfJITOperationsInJSC, &endOfJITOperationsInJSC);
</span><span class="cx">     });
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void JITOperationList::populatePointersInJavaScriptCoreForLLInt()
</span><span class="cx"> {
</span><del>-#if ENABLE(JIT_OPERATION_VALIDATION)
</del><span class="cx">     static std::once_flag onceKey;
</span><span class="cx">     std::call_once(onceKey, [] {
</span><span class="cx"> 
</span><span class="lines">@@ -124,7 +119,6 @@
</span><span class="cx">             addPointers(jitOperationList->m_validatedOperations, operations, operations + WTF_ARRAY_LENGTH(operations));
</span><span class="cx"> #undef LLINT_RETURN_LOCATION
</span><span class="cx">     });
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -132,10 +126,10 @@
</span><span class="cx"> {
</span><span class="cx">     UNUSED_PARAM(beginOperations);
</span><span class="cx">     UNUSED_PARAM(endOperations);
</span><del>-#if ENABLE(JIT_OPERATION_VALIDATION)
</del><span class="cx">     if (Options::useJIT())
</span><span class="cx">         addPointers(jitOperationList->m_validatedOperations, beginOperations, endOperations);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#endif // ENABLE(JIT_OPERATION_VALIDATION)
+
</ins><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="branchessafari612branchSourceJavaScriptCoreassemblerJITOperationListh"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/JavaScriptCore/assembler/JITOperationList.h (282568 => 282569)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/JavaScriptCore/assembler/JITOperationList.h    2021-09-16 18:48:05 UTC (rev 282568)
+++ branches/safari-612-branch/Source/JavaScriptCore/assembler/JITOperationList.h       2021-09-16 18:48:10 UTC (rev 282569)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2020 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2020-2021 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx"> 
</span><span class="cx"> namespace JSC {
</span><span class="cx"> 
</span><ins>+#if ENABLE(JIT_OPERATION_VALIDATION)
+
</ins><span class="cx"> class JITOperationList {
</span><span class="cx"> public:
</span><span class="cx">     static JITOperationList& instance();
</span><span class="lines">@@ -39,11 +41,7 @@
</span><span class="cx"> 
</span><span class="cx">     void* map(void* pointer) const
</span><span class="cx">     {
</span><del>-#if ENABLE(JIT_OPERATION_VALIDATION)
</del><span class="cx">         return m_validatedOperations.get(removeCodePtrTag(pointer));
</span><del>-#else
-        return pointer;
-#endif
</del><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     static void populatePointersInJavaScriptCore();
</span><span class="lines">@@ -54,9 +52,7 @@
</span><span class="cx">     template<typename T> static void assertIsJITOperation(T function)
</span><span class="cx">     {
</span><span class="cx">         UNUSED_PARAM(function);
</span><del>-#if ENABLE(JIT_OPERATION_VALIDATION)
</del><span class="cx">         ASSERT(!Options::useJIT() || JITOperationList::instance().map(bitwise_cast<void*>(function)));
</span><del>-#endif
</del><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="lines">@@ -70,4 +66,18 @@
</span><span class="cx">     return jitOperationList.get();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#else // not ENABLE(JIT_OPERATION_VALIDATION)
+
+class JITOperationList {
+public:
+    static void initialize() { }
+
+    static void populatePointersInJavaScriptCore() { }
+    static void populatePointersInJavaScriptCoreForLLInt() { }
+
+    template<typename T> static void assertIsJITOperation(T) { }
+};
+
+#endif // ENABLE(JIT_OPERATION_VALIDATION)
+
</ins><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="branchessafari612branchSourceJavaScriptCoreruntimeJSCPtrTagh"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/JavaScriptCore/runtime/JSCPtrTag.h (282568 => 282569)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/JavaScriptCore/runtime/JSCPtrTag.h     2021-09-16 18:48:05 UTC (rev 282568)
+++ branches/safari-612-branch/Source/JavaScriptCore/runtime/JSCPtrTag.h        2021-09-16 18:48:10 UTC (rev 282569)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx">     static_assert(callerType == PtrTagCallerType::JIT);
</span><span class="cx">     if constexpr (calleeType == PtrTagCalleeType::Native) {
</span><span class="cx">         static_assert(tag == OperationPtrTag);
</span><del>-        JITOperationList::instance().assertIsJITOperation(ptr);
</del><ins>+        JITOperationList::assertIsJITOperation(ptr);
</ins><span class="cx"> #if ENABLE(JIT_CAGE)
</span><span class="cx">         if (Options::useJITCage())
</span><span class="cx">             return bitwise_cast<PtrType>(JITOperationList::instance().map(bitwise_cast<void*>(ptr)));
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">     static_assert(callerType == PtrTagCallerType::JIT);
</span><span class="cx">     if constexpr (calleeType == PtrTagCalleeType::Native) {
</span><span class="cx">         static_assert(tag == OperationPtrTag);
</span><del>-        JITOperationList::instance().assertIsJITOperation(ptr);
</del><ins>+        JITOperationList::assertIsJITOperation(ptr);
</ins><span class="cx"> #if ENABLE(JIT_CAGE)
</span><span class="cx">         if (Options::useJITCage()) {
</span><span class="cx">             RELEASE_ASSERT(bitwise_cast<PtrType>(JITOperationList::instance().map(bitwise_cast<void*>(ptr))) == ptr);
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/ChangeLog (282568 => 282569)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/ChangeLog      2021-09-16 18:48:05 UTC (rev 282568)
+++ branches/safari-612-branch/Source/WebCore/ChangeLog 2021-09-16 18:48:10 UTC (rev 282569)
</span><span class="lines">@@ -1,3 +1,62 @@
</span><ins>+2021-09-16  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r281544. rdar://problem/83183832
+
+    Refactor ENABLE(JIT_OPERATION_VALIDATION) code to emit no code when disabled.
+    https://bugs.webkit.org/show_bug.cgi?id=229482
+    rdar://82318317
+    
+    Reviewed by Yusuke Suzuki.
+    
+    Source/JavaScriptCore:
+    
+    * assembler/JITOperationList.cpp:
+    (JSC::addPointers):
+    (JSC::JITOperationList::populatePointersInJavaScriptCore):
+    (JSC::JITOperationList::populatePointersInJavaScriptCoreForLLInt):
+    (JSC::JITOperationList::populatePointersInEmbedder):
+    * assembler/JITOperationList.h:
+    (JSC::JITOperationList::map const):
+    (JSC::JITOperationList::assertIsJITOperation):
+    (JSC::JITOperationList::initialize):
+    (JSC::JITOperationList::populatePointersInJavaScriptCore):
+    (JSC::JITOperationList::populatePointersInJavaScriptCoreForLLInt):
+    * runtime/JSCPtrTag.h:
+    (JSC::tagJSCCodePtrImpl):
+    (JSC::untagJSCCodePtrImpl):
+    
+    Source/WebCore:
+    
+    * bindings/js/WebCoreJITOperations.cpp:
+    (WebCore::populateJITOperations):
+    * bindings/js/WebCoreJITOperations.h:
+    (WebCore::populateJITOperations):
+    * testing/js/WebCoreTestSupport.cpp:
+    (WebCoreTestSupport::populateJITOperations):
+    * testing/js/WebCoreTestSupport.h:
+    (WebCoreTestSupport::populateJITOperations):
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281544 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-08-24  Mark Lam  <mark.lam@apple.com>
+
+            Refactor ENABLE(JIT_OPERATION_VALIDATION) code to emit no code when disabled.
+            https://bugs.webkit.org/show_bug.cgi?id=229482
+            rdar://82318317
+
+            Reviewed by Yusuke Suzuki.
+
+            * bindings/js/WebCoreJITOperations.cpp:
+            (WebCore::populateJITOperations):
+            * bindings/js/WebCoreJITOperations.h:
+            (WebCore::populateJITOperations):
+            * testing/js/WebCoreTestSupport.cpp:
+            (WebCoreTestSupport::populateJITOperations):
+            * testing/js/WebCoreTestSupport.h:
+            (WebCoreTestSupport::populateJITOperations):
+
</ins><span class="cx"> 2021-09-09  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r281648. rdar://problem/82944435
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCorebindingsjsWebCoreJITOperationscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/bindings/js/WebCoreJITOperations.cpp (282568 => 282569)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/bindings/js/WebCoreJITOperations.cpp   2021-09-16 18:48:05 UTC (rev 282568)
+++ branches/safari-612-branch/Source/WebCore/bindings/js/WebCoreJITOperations.cpp      2021-09-16 18:48:10 UTC (rev 282569)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2020 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2020-2021 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -33,16 +33,14 @@
</span><span class="cx"> #if ENABLE(JIT_OPERATION_VALIDATION)
</span><span class="cx"> extern const uintptr_t startOfJITOperationsInWebCore __asm("section$start$__DATA_CONST$__jsc_ops");
</span><span class="cx"> extern const uintptr_t endOfJITOperationsInWebCore __asm("section$end$__DATA_CONST$__jsc_ops");
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> void populateJITOperations()
</span><span class="cx"> {
</span><del>-#if ENABLE(JIT_OPERATION_VALIDATION)
</del><span class="cx">     static std::once_flag onceKey;
</span><span class="cx">     std::call_once(onceKey, [] {
</span><span class="cx">         JSC::JITOperationList::populatePointersInEmbedder(&startOfJITOperationsInWebCore, &endOfJITOperationsInWebCore);
</span><span class="cx">     });
</span><del>-#endif
</del><span class="cx"> }
</span><ins>+#endif // ENABLE(JIT_OPERATION_VALIDATION)
</ins><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCorebindingsjsWebCoreJITOperationsh"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/bindings/js/WebCoreJITOperations.h (282568 => 282569)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/bindings/js/WebCoreJITOperations.h     2021-09-16 18:48:05 UTC (rev 282568)
+++ branches/safari-612-branch/Source/WebCore/bindings/js/WebCoreJITOperations.h        2021-09-16 18:48:10 UTC (rev 282569)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2020 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2020-2021 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -27,6 +27,10 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><ins>+#if ENABLE(JIT_OPERATION_VALIDATION)
</ins><span class="cx"> WEBCORE_EXPORT void populateJITOperations();
</span><ins>+#else
+inline void populateJITOperations() { }
+#endif
</ins><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCoretestingjsWebCoreTestSupportcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/testing/js/WebCoreTestSupport.cpp (282568 => 282569)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/testing/js/WebCoreTestSupport.cpp      2021-09-16 18:48:05 UTC (rev 282568)
+++ branches/safari-612-branch/Source/WebCore/testing/js/WebCoreTestSupport.cpp 2021-09-16 18:48:10 UTC (rev 282569)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx">  * Copyright (C) 2011, 2015 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2016-2020 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2016-2021 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -245,16 +245,14 @@
</span><span class="cx"> #if ENABLE(JIT_OPERATION_VALIDATION)
</span><span class="cx"> extern const uintptr_t startOfJITOperationsInWebCoreTestSupport __asm("section$start$__DATA_CONST$__jsc_ops");
</span><span class="cx"> extern const uintptr_t endOfJITOperationsInWebCoreTestSupport __asm("section$end$__DATA_CONST$__jsc_ops");
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> void populateJITOperations()
</span><span class="cx"> {
</span><del>-#if ENABLE(JIT_OPERATION_VALIDATION)
</del><span class="cx">     static std::once_flag onceKey;
</span><span class="cx">     std::call_once(onceKey, [] {
</span><span class="cx">         JSC::JITOperationList::populatePointersInEmbedder(&startOfJITOperationsInWebCoreTestSupport, &endOfJITOperationsInWebCoreTestSupport);
</span><span class="cx">     });
</span><del>-#endif
</del><span class="cx"> }
</span><ins>+#endif // ENABLE(JIT_OPERATION_VALIDATION)
</ins><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCoretestingjsWebCoreTestSupporth"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/testing/js/WebCoreTestSupport.h (282568 => 282569)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/testing/js/WebCoreTestSupport.h        2021-09-16 18:48:05 UTC (rev 282568)
+++ branches/safari-612-branch/Source/WebCore/testing/js/WebCoreTestSupport.h   2021-09-16 18:48:10 UTC (rev 282569)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx">  * Copyright (C) 2011, 2015 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2016-2018 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2016-2021 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -67,6 +67,10 @@
</span><span class="cx">     
</span><span class="cx"> void setAdditionalSupportedImageTypesForTesting(const WTF::String&) TEST_SUPPORT_EXPORT;
</span><span class="cx"> 
</span><ins>+#if ENABLE(JIT_OPERATION_VALIDATION)
</ins><span class="cx"> void populateJITOperations() TEST_SUPPORT_EXPORT;
</span><ins>+#else
+inline void populateJITOperations() { }
+#endif
</ins><span class="cx"> 
</span><span class="cx"> } // namespace WebCoreTestSupport
</span></span></pre>
</div>
</div>

</body>
</html>