Changeset 64849 in webkit for trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

Timestamp:

Aug 6, 2010, 7:55:54 AM (15 years ago)

Author:

[email protected]

Message:

2010-08-06 Nathan Lawrence <​[email protected]>

Reviewed by Geoffrey Garen.

​https://bugs.webkit.org/show_bug.cgi?id=43207

WeakGCPtr's should instead of directly pointing to the GC'd object
should be directed to an array of pointers that can be updated for
movable objects.

• Android.mk:
• GNUmakefile.am:
• JavaScriptCore.exp:
• JavaScriptCore.gypi:
• JavaScriptCore.pro:
• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/Collector.cpp: (JSC::Heap::destroy): (JSC::Heap::allocateBlock): (JSC::Heap::freeBlock): (JSC::Heap::updateWeakGCHandles): (JSC::WeakGCHandlePool::update): (JSC::Heap::addWeakGCHandle): (JSC::Heap::markRoots):
• runtime/Collector.h: (JSC::Heap::weakGCHandlePool):
• runtime/GCHandle.cpp: Added. (JSC::WeakGCHandle::pool): (JSC::WeakGCHandlePool::WeakGCHandlePool): (JSC::WeakGCHandlePool::allocate): (JSC::WeakGCHandlePool::free): (JSC::WeakGCHandlePool::operator new):
• runtime/GCHandle.h: Added. (JSC::WeakGCHandle::isValidPtr): (JSC::WeakGCHandle::isPtr): (JSC::WeakGCHandle::isNext): (JSC::WeakGCHandle::invalidate): (JSC::WeakGCHandle::get): (JSC::WeakGCHandle::set): (JSC::WeakGCHandle::getNextInFreeList): (JSC::WeakGCHandle::setNextInFreeList): (JSC::WeakGCHandlePool::isFull):
• runtime/WeakGCPtr.h: (JSC::WeakGCPtr::WeakGCPtr): (JSC::WeakGCPtr::~WeakGCPtr): (JSC::WeakGCPtr::get): (JSC::WeakGCPtr::clear): (JSC::WeakGCPtr::assign): (JSC::get):

File:

• trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (modified) (9 diffs)

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -513 +513 @@
                 DD2724691208D1FF00F9ABE7 /* AlignedMemoryAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = DD2724671208D1FF00F9ABE7 /* AlignedMemoryAllocator.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 DD377CBC12072C18006A2517 /* Bitmap.h in Headers */ = {isa = PBXBuildFile; fileRef = DD377CBB12072C18006A2517 /* Bitmap.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                DDE82AD31209D955005C1756 /* GCHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE82AD11209D955005C1756 /* GCHandle.cpp */; };
+                DDE82AD41209D955005C1756 /* GCHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE82AD11209D955005C1756 /* GCHandle.cpp */; };
+                DDE82AD51209D955005C1756 /* GCHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE82AD11209D955005C1756 /* GCHandle.cpp */; };
+                DDE82AD61209D955005C1756 /* GCHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = DDE82AD21209D955005C1756 /* GCHandle.h */; };
+                DDE82AD71209D955005C1756 /* GCHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE82AD11209D955005C1756 /* GCHandle.cpp */; };
+                DDE82AD81209D955005C1756 /* GCHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = DDE82AD21209D955005C1756 /* GCHandle.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 DDF7ABD411F60ED200108E36 /* GCActivityCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF7ABD211F60ED200108E36 /* GCActivityCallback.h */; };
                 DDF7ABD511F60ED200108E36 /* GCActivityCallbackCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDF7ABD311F60ED200108E36 /* GCActivityCallbackCF.cpp */; };
@@ -1059 +1065 @@
                 DD2724671208D1FF00F9ABE7 /* AlignedMemoryAllocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlignedMemoryAllocator.h; sourceTree = "<group>"; };
                 DD377CBB12072C18006A2517 /* Bitmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Bitmap.h; sourceTree = "<group>"; };
+                DDE82AD11209D955005C1756 /* GCHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GCHandle.cpp; sourceTree = "<group>"; };
+                DDE82AD21209D955005C1756 /* GCHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCHandle.h; sourceTree = "<group>"; };
                 DDF7ABD211F60ED200108E36 /* GCActivityCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCActivityCallback.h; sourceTree = "<group>"; };
                 DDF7ABD311F60ED200108E36 /* GCActivityCallbackCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GCActivityCallbackCF.cpp; sourceTree = "<group>"; };
@@ -1625 +1633 @@
                                 F692A85C0255597D01FF60F7 /* FunctionPrototype.cpp */,
                                 F692A85D0255597D01FF60F7 /* FunctionPrototype.h */,
+                                DDE82AD11209D955005C1756 /* GCHandle.cpp */,
+                                DDE82AD21209D955005C1756 /* GCHandle.h */,
                                 BC02E9B80E184545000F9297 /* GetterSetter.cpp */,
                                 BC337BDE0E1AF0B80076918A /* GetterSetter.h */,
@@ -1913 +1923 @@
                                 1440074A0A536CC20005F061 /* NodeList.h in Headers */,
                                 DD2724681208D1FF00F9ABE7 /* AlignedMemoryAllocator.h in Headers */,
+                                DDE82AD61209D955005C1756 /* GCHandle.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -2215 +2226 @@
                                 DDF7ABD411F60ED200108E36 /* GCActivityCallback.h in Headers */,
                                 DD2724691208D1FF00F9ABE7 /* AlignedMemoryAllocator.h in Headers */,
+                                DDE82AD81209D955005C1756 /* GCHandle.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -2476 +2488 @@
                                 1440063F0A53598A0005F061 /* Node.c in Sources */,
                                 1440074B0A536CC20005F061 /* NodeList.c in Sources */,
+                                DDE82AD51209D955005C1756 /* GCHandle.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -2484 +2497 @@
                         files = (
                                 1440F6100A4F85670005F061 /* testapi.c in Sources */,
+                                DDE82AD41209D955005C1756 /* GCHandle.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -2663 +2677 @@
                                 DDF7ABD511F60ED200108E36 /* GCActivityCallbackCF.cpp in Sources */,
                                 8627E5EB11F1281900A313B5 /* PageAllocation.cpp in Sources */,
+                                DDE82AD71209D955005C1756 /* GCHandle.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -2671 +2686 @@
                         files = (
                                 932F5BDD0822A1C700736975 /* jsc.cpp in Sources */,
+                                DDE82AD31209D955005C1756 /* GCHandle.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;