Changeset 44443 in webkit for trunk/JavaScriptCore/assembler/AbstractMacroAssembler.h

Timestamp:

Jun 4, 2009, 5:36:56 PM (16 years ago)

Author:

[email protected]

Message:

2009-06-04 Gavin Barraclough <​[email protected]>

Reviewed by Sam Weinig.

Minor tweak to PatchBuffer, change it so it no longer holds a CodeRef, and instead
holds a separate code pointer and executable pool. Since it now always holds its
own copy of the code size, and to simplify the construction sequence, it's neater
this way.

• assembler/AbstractMacroAssembler.h: (JSC::AbstractMacroAssembler::PatchBuffer::PatchBuffer): (JSC::AbstractMacroAssembler::PatchBuffer::finalizeCode): (JSC::AbstractMacroAssembler::PatchBuffer::code): (JSC::AbstractMacroAssembler::PatchBuffer::performFinalization):

File:

• trunk/JavaScriptCore/assembler/AbstractMacroAssembler.h (modified) (5 diffs)

trunk/JavaScriptCore/assembler/AbstractMacroAssembler.h

@@ -720 +720 @@
     class PatchBuffer : public Noncopyable {
     public:
+        // Note: Initialization sequence is significant, since executablePool is a PassRefPtr.
+        //       First, executablePool is copied into m_executablePool, then the initialization of
+        //       m_code uses m_executablePool, *not* executablePool, since this is no longer valid.
         PatchBuffer(AbstractMacroAssembler<AssemblerType>* masm, PassRefPtr<ExecutablePool> executablePool)
-            : m_ref(0, executablePool, masm->m_assembler.size())
+            : m_executablePool(executablePool)
+            , m_code(masm->m_assembler.executableCopy(m_executablePool.get()))
             , m_size(masm->m_assembler.size())
 #ifndef NDEBUG
@@ -727 +731 @@
 #endif
         {
-            m_ref.m_code = masm->m_assembler.executableCopy(m_ref.m_executablePool.get());
         }
 
@@ -830 +833 @@
             performFinalization();
 
-            return m_ref;
+            return CodeRef(m_code, m_executablePool, m_size);
         }
         CodeLocationLabel finalizeCodeAddendum()
@@ -844 +847 @@
         void* code()
         {
-            return m_ref.m_code;
+            return m_code;
         }
 
@@ -854 +857 @@
 #endif
 
-            ExecutableAllocator::makeExecutable(m_ref.m_code, m_size);
-        }
-
-        CodeRef m_ref;
+            ExecutableAllocator::makeExecutable(m_code, m_size);
+        }
+
+        RefPtr<ExecutablePool> m_executablePool;
+        void* m_code;
         size_t m_size;
 #ifndef NDEBUG