Changeset 249858 in webkit

Timestamp:

Sep 13, 2019 4:45:16 PM (5 years ago)

Author:

mark.lam@apple.com

Message:

performJITMemcpy() should do its !Gigacage assertion on exit.
​https://bugs.webkit.org/show_bug.cgi?id=201780
<rdar://problem/55354867>

Reviewed by Robin Morisset.

Re-doing previous fix.

• jit/ExecutableAllocator.h:

(JSC::performJITMemcpy):
(JSC::GigacageAssertScope::GigacageAssertScope): Deleted.
(JSC::GigacageAssertScope::~GigacageAssertScope): Deleted.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/ExecutableAllocator.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-09-13  Mark Lam  <mark.lam@apple.com>
+
+        performJITMemcpy() should do its !Gigacage assertion on exit.
+        https://bugs.webkit.org/show_bug.cgi?id=201780
+        <rdar://problem/55354867>
+
+        Reviewed by Robin Morisset.
+
+        Re-doing previous fix.
+
+        * jit/ExecutableAllocator.h:
+        (JSC::performJITMemcpy):
+        (JSC::GigacageAssertScope::GigacageAssertScope): Deleted.
+        (JSC::GigacageAssertScope::~GigacageAssertScope): Deleted.
+
 2019-09-13  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/jit/ExecutableAllocator.h

@@ -117 +117 @@
 JS_EXPORT_PRIVATE void dumpJITMemory(const void*, const void*, size_t);
 
-struct GigacageAssertScope {
-    GigacageAssertScope(const void *src)
-        : src(src)
-    { }
-    ~GigacageAssertScope() { RELEASE_ASSERT(!Gigacage::contains(src)); }
-    const void* src;
-};
-
 static ALWAYS_INLINE void* performJITMemcpy(void *dst, const void *src, size_t n)
 {
-    GigacageAssertScope assertScope(src);
 #if CPU(ARM64)
     static constexpr size_t instructionSize = sizeof(unsigned);
@@ -145 +136 @@
             os_thread_self_restrict_rwx_to_rw();
             memcpy(dst, src, n);
+            RELEASE_ASSERT(!Gigacage::contains(src));
             os_thread_self_restrict_rwx_to_rx();
             return dst;
@@ -156 +148 @@
             off_t offset = (off_t)((uintptr_t)dst - startOfFixedExecutableMemoryPool<uintptr_t>());
             retagCodePtr<JITThunkPtrTag, CFunctionPtrTag>(g_jscConfig.jitWriteSeparateHeaps)(offset, src, n);
+            RELEASE_ASSERT(!Gigacage::contains(src));
             return dst;
         }