Changeset 42649 in webkit for trunk/JavaScriptCore/runtime/Collector.cpp

Timestamp:

Apr 18, 2009, 7:14:58 PM (16 years ago)

Author:

[email protected]

Message:

2009-04-18 Sam Weinig <​[email protected]>

Reviewed by Anders Carlsson.

Fix for <rdar://problem/6801555> Tag JavaScript memory on SnowLeopard

• interpreter/RegisterFile.h: (JSC::RegisterFile::RegisterFile):
• jit/ExecutableAllocatorFixedVMPool.cpp: (JSC::FixedVMPoolAllocator::FixedVMPoolAllocator):
• jit/ExecutableAllocatorPosix.cpp: (JSC::ExecutablePool::systemAlloc):
• runtime/Collector.cpp: (JSC::allocateBlock):

File:

• trunk/JavaScriptCore/runtime/Collector.cpp (modified) (2 diffs)

trunk/JavaScriptCore/runtime/Collector.cpp

@@ -41 +41 @@
 #if PLATFORM(DARWIN)
 
+#include <mach/mach_init.h>
 #include <mach/mach_port.h>
-#include <mach/mach_init.h>
 #include <mach/task.h>
 #include <mach/thread_act.h>
 #include <mach/vm_map.h>
+#include <mach/vm_statistics.h>
 
 #elif PLATFORM(WIN_OS)
@@ -182 +183 @@
 {
 #if PLATFORM(DARWIN)
+    #if defined(VM_MEMORY_JAVASCRIPT_CORE)
+        #define TAG VM_MAKE_TAG(VM_MEMORY_JAVASCRIPT_JIT_REGISTER_FILE)
+    #else
+        #define TAG 0
+    #endif
     vm_address_t address = 0;
     // FIXME: tag the region as a JavaScriptCore heap when we get a registered VM tag: <rdar://problem/6054788>.
-    vm_map(current_task(), &address, BLOCK_SIZE, BLOCK_OFFSET_MASK, VM_FLAGS_ANYWHERE, MEMORY_OBJECT_NULL, 0, FALSE, VM_PROT_DEFAULT, VM_PROT_DEFAULT, VM_INHERIT_DEFAULT);
+    vm_map(current_task(), &address, BLOCK_SIZE, BLOCK_OFFSET_MASK, VM_FLAGS_ANYWHERE|TAG, MEMORY_OBJECT_NULL, 0, FALSE, VM_PROT_DEFAULT, VM_PROT_DEFAULT, VM_INHERIT_DEFAULT);
 #elif PLATFORM(SYMBIAN)
     // no memory map in symbian, need to hack with fastMalloc