Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (188230 => 188231)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2015-08-10 21:35:54 UTC (rev 188230)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2015-08-10 21:54:36 UTC (rev 188231)
@@ -291,6 +291,7 @@
heap/HeapVerifier.cpp
heap/IncrementalSweeper.cpp
heap/JITStubRoutineSet.cpp
+ heap/LiveObjectList.cpp
heap/MachineStackMarker.cpp
heap/MarkStack.cpp
heap/MarkedAllocator.cpp
Modified: trunk/Source/_javascript_Core/ChangeLog (188230 => 188231)
--- trunk/Source/_javascript_Core/ChangeLog 2015-08-10 21:35:54 UTC (rev 188230)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-08-10 21:54:36 UTC (rev 188231)
@@ -1,3 +1,31 @@
+2015-08-10 Mark Lam <mark....@apple.com>
+
+ Refactor LiveObjectList and LiveObjectData into their own files.
+ https://bugs.webkit.org/show_bug.cgi?id=147843
+
+ Reviewed by Saam Barati.
+
+ There is no behavior change in this patch.
+
+ * CMakeLists.txt:
+ * _javascript_Core.vcxproj/_javascript_Core.vcxproj:
+ * _javascript_Core.vcxproj/_javascript_Core.vcxproj.filters:
+ * _javascript_Core.xcodeproj/project.pbxproj:
+ * heap/HeapVerifier.cpp:
+ (JSC::HeapVerifier::HeapVerifier):
+ (JSC::LiveObjectList::findObject): Deleted.
+ * heap/HeapVerifier.h:
+ (JSC::LiveObjectData::LiveObjectData): Deleted.
+ (JSC::LiveObjectList::LiveObjectList): Deleted.
+ (JSC::LiveObjectList::reset): Deleted.
+ * heap/LiveObjectData.h: Added.
+ (JSC::LiveObjectData::LiveObjectData):
+ * heap/LiveObjectList.cpp: Added.
+ (JSC::LiveObjectList::findObject):
+ * heap/LiveObjectList.h: Added.
+ (JSC::LiveObjectList::LiveObjectList):
+ (JSC::LiveObjectList::reset):
+
2015-08-07 Geoffrey Garen <gga...@apple.com>
Let's rename FunctionBodyNode
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj (188230 => 188231)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj 2015-08-10 21:35:54 UTC (rev 188230)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj 2015-08-10 21:54:36 UTC (rev 188231)
@@ -565,6 +565,7 @@
<ClCompile Include="..\heap\HeapVerifier.cpp" />
<ClCompile Include="..\heap\IncrementalSweeper.cpp" />
<ClCompile Include="..\heap\JITStubRoutineSet.cpp" />
+ <ClCompile Include="..\heap\LiveObjectList.cpp" />
<ClCompile Include="..\heap\MachineStackMarker.cpp" />
<ClCompile Include="..\heap\MarkedAllocator.cpp" />
<ClCompile Include="..\heap\MarkedBlock.cpp" />
@@ -1321,6 +1322,8 @@
<ClInclude Include="..\heap\IncrementalSweeper.h" />
<ClInclude Include="..\heap\JITStubRoutineSet.h" />
<ClInclude Include="..\heap\ListableHandler.h" />
+ <ClInclude Include="..\heap\LiveObjectData.h" />
+ <ClInclude Include="..\heap\LiveObjectList.h" />
<ClInclude Include="..\heap\Local.h" />
<ClInclude Include="..\heap\LocalScope.h" />
<ClInclude Include="..\heap\MachineStackMarker.h" />
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters (188230 => 188231)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters 2015-08-10 21:35:54 UTC (rev 188230)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters 2015-08-10 21:54:36 UTC (rev 188231)
@@ -294,6 +294,9 @@
<ClCompile Include="..\heap\JITStubRoutineSet.cpp">
<Filter>heap</Filter>
</ClCompile>
+ <ClCompile Include="..\heap\LiveObjectList.cpp">
+ <Filter>heap</Filter>
+ </ClCompile>
<ClCompile Include="..\heap\MachineStackMarker.cpp">
<Filter>heap</Filter>
</ClCompile>
@@ -2237,6 +2240,12 @@
<ClInclude Include="..\heap\ListableHandler.h">
<Filter>heap</Filter>
</ClInclude>
+ <ClInclude Include="..\heap\LiveObjectData.h">
+ <Filter>heap</Filter>
+ </ClInclude>
+ <ClInclude Include="..\heap\LiveObjectList.h">
+ <Filter>heap</Filter>
+ </ClInclude>
<ClInclude Include="..\heap\Local.h">
<Filter>heap</Filter>
</ClInclude>
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (188230 => 188231)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2015-08-10 21:35:54 UTC (rev 188230)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2015-08-10 21:54:36 UTC (rev 188231)
@@ -1705,6 +1705,9 @@
FE384EE61ADDB7AD0055DE2C /* JSDollarVM.h in Headers */ = {isa = PBXBuildFile; fileRef = FE384EE21ADDB7AD0055DE2C /* JSDollarVM.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE384EE71ADDB7AD0055DE2C /* JSDollarVMPrototype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE384EE31ADDB7AD0055DE2C /* JSDollarVMPrototype.cpp */; };
FE384EE81ADDB7AD0055DE2C /* JSDollarVMPrototype.h in Headers */ = {isa = PBXBuildFile; fileRef = FE384EE41ADDB7AD0055DE2C /* JSDollarVMPrototype.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ FE3913541B794F6E00EDAF71 /* LiveObjectList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE3913521B794AC900EDAF71 /* LiveObjectList.cpp */; };
+ FE3913551B794F8A00EDAF71 /* LiveObjectData.h in Headers */ = {isa = PBXBuildFile; fileRef = FE3913511B794AC900EDAF71 /* LiveObjectData.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ FE3913561B794F8F00EDAF71 /* LiveObjectList.h in Headers */ = {isa = PBXBuildFile; fileRef = FE3913531B794AC900EDAF71 /* LiveObjectList.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE4BFF2B1AD476E700088F87 /* FunctionOverrides.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE4BFF291AD476E700088F87 /* FunctionOverrides.cpp */; };
FE4BFF2C1AD476E700088F87 /* FunctionOverrides.h in Headers */ = {isa = PBXBuildFile; fileRef = FE4BFF2A1AD476E700088F87 /* FunctionOverrides.h */; };
FE4D55B81AE716CA0052E459 /* IterationStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = FE4D55B71AE716CA0052E459 /* IterationStatus.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -3557,6 +3560,9 @@
FE384EE21ADDB7AD0055DE2C /* JSDollarVM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDollarVM.h; sourceTree = "<group>"; };
FE384EE31ADDB7AD0055DE2C /* JSDollarVMPrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDollarVMPrototype.cpp; sourceTree = "<group>"; };
FE384EE41ADDB7AD0055DE2C /* JSDollarVMPrototype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDollarVMPrototype.h; sourceTree = "<group>"; };
+ FE3913511B794AC900EDAF71 /* LiveObjectData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveObjectData.h; sourceTree = "<group>"; };
+ FE3913521B794AC900EDAF71 /* LiveObjectList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LiveObjectList.cpp; sourceTree = "<group>"; };
+ FE3913531B794AC900EDAF71 /* LiveObjectList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveObjectList.h; sourceTree = "<group>"; };
FE4BFF291AD476E700088F87 /* FunctionOverrides.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FunctionOverrides.cpp; sourceTree = "<group>"; };
FE4BFF2A1AD476E700088F87 /* FunctionOverrides.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FunctionOverrides.h; sourceTree = "<group>"; };
FE4D55B71AE716CA0052E459 /* IterationStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IterationStatus.h; sourceTree = "<group>"; };
@@ -4083,6 +4089,9 @@
FE7BA60D1A1A7CEC00F1F7B4 /* HeapVerifier.cpp */,
FE7BA60E1A1A7CEC00F1F7B4 /* HeapVerifier.h */,
C2DA778218E259990066FCB6 /* HeapInlines.h */,
+ FE3913511B794AC900EDAF71 /* LiveObjectData.h */,
+ FE3913521B794AC900EDAF71 /* LiveObjectList.cpp */,
+ FE3913531B794AC900EDAF71 /* LiveObjectList.h */,
ADDB1F6218D77DB7009B58A8 /* OpaqueRootSet.h */,
2AACE63A18CA5A0300ED0191 /* GCActivityCallback.cpp */,
2AACE63B18CA5A0300ED0191 /* GCActivityCallback.h */,
@@ -6329,6 +6338,7 @@
7B39F76E1B62DE3200360FB4 /* WASMModuleParser.h in Headers */,
BC18C4210E16F5CD00B34460 /* JSGlobalObject.h in Headers */,
A5FD0086189B1B7E00633231 /* JSGlobalObjectConsoleAgent.h in Headers */,
+ FE3913561B794F8F00EDAF71 /* LiveObjectList.h in Headers */,
A59455931824744700CC3843 /* JSGlobalObjectDebuggable.h in Headers */,
A57D23EA1891B0770031C7FA /* JSGlobalObjectDebuggerAgent.h in Headers */,
BC756FC90E2031B200DE7D12 /* JSGlobalObjectFunctions.h in Headers */,
@@ -6691,6 +6701,7 @@
142E313C134FF0A600AFADB5 /* Weak.h in Headers */,
14E84F9F14EE1ACC00D6D5D4 /* WeakBlock.h in Headers */,
14BFCE6910CDB1FC00364CCE /* WeakGCMap.h in Headers */,
+ FE3913551B794F8A00EDAF71 /* LiveObjectData.h in Headers */,
14F7256614EE265E00B1652B /* WeakHandleOwner.h in Headers */,
14E84FA214EE1ACC00D6D5D4 /* WeakImpl.h in Headers */,
0F2DD8121AB3D8BE00BBB8E8 /* DFGArgumentsEliminationPhase.h in Headers */,
@@ -7415,6 +7426,7 @@
0F0332C018ADFAE1005F979A /* ExitingJITType.cpp in Sources */,
0FB105851675480F00F8AB6E /* ExitKind.cpp in Sources */,
0FEA0A1C1708B00700BB722C /* FTLAbstractHeap.cpp in Sources */,
+ FE3913541B794F6E00EDAF71 /* LiveObjectList.cpp in Sources */,
0F978B3B1AAEA71D007C7369 /* ConstantMode.cpp in Sources */,
0FE050251AA9095600D33B33 /* ClonedArguments.cpp in Sources */,
0F79085519A290B200F6310C /* DFGStructureRegistrationPhase.cpp in Sources */,
Modified: trunk/Source/_javascript_Core/heap/HeapVerifier.cpp (188230 => 188231)
--- trunk/Source/_javascript_Core/heap/HeapVerifier.cpp 2015-08-10 21:35:54 UTC (rev 188230)
+++ trunk/Source/_javascript_Core/heap/HeapVerifier.cpp 2015-08-10 21:54:36 UTC (rev 188231)
@@ -34,16 +34,6 @@
namespace JSC {
-LiveObjectData* LiveObjectList::findObject(JSObject* obj)
-{
- for (size_t i = 0; i < liveObjects.size(); i++) {
- LiveObjectData& data = ""
- if (obj == data.obj)
- return &data;
- }
- return nullptr;
-}
-
HeapVerifier::HeapVerifier(Heap* heap, unsigned numberOfGCCyclesToRecord)
: m_heap(heap)
, m_currentCycle(0)
Modified: trunk/Source/_javascript_Core/heap/HeapVerifier.h (188230 => 188231)
--- trunk/Source/_javascript_Core/heap/HeapVerifier.h 2015-08-10 21:35:54 UTC (rev 188230)
+++ trunk/Source/_javascript_Core/heap/HeapVerifier.h 2015-08-10 21:54:36 UTC (rev 188231)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2015 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -27,44 +27,13 @@
#define HeapVerifier_h
#include "Heap.h"
-#include <wtf/Vector.h>
+#include "LiveObjectList.h"
namespace JSC {
class JSObject;
class MarkedBlock;
-struct LiveObjectData {
- LiveObjectData(JSObject* obj, bool isConfirmedDead = false)
- : obj(obj)
- , isConfirmedDead(isConfirmedDead)
- {
- }
-
- JSObject* obj;
- bool isConfirmedDead;
-};
-
-struct LiveObjectList {
- LiveObjectList(const char* name)
- : name(name)
- , hasLiveObjects(true)
- {
- }
-
- void reset()
- {
- liveObjects.clear();
- hasLiveObjects = true; // Presume to have live objects until the list is trimmed.
- }
-
- LiveObjectData* findObject(JSObject*);
-
- const char* name;
- Vector<LiveObjectData> liveObjects;
- bool hasLiveObjects;
-};
-
class HeapVerifier {
WTF_MAKE_FAST_ALLOCATED;
public:
Added: trunk/Source/_javascript_Core/heap/LiveObjectData.h (0 => 188231)
--- trunk/Source/_javascript_Core/heap/LiveObjectData.h (rev 0)
+++ trunk/Source/_javascript_Core/heap/LiveObjectData.h 2015-08-10 21:54:36 UTC (rev 188231)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef LiveObjectData_h
+#define LiveObjectData_h
+
+namespace JSC {
+
+class JSObject;
+
+struct LiveObjectData {
+ LiveObjectData(JSObject* obj, bool isConfirmedDead = false)
+ : obj(obj)
+ , isConfirmedDead(isConfirmedDead)
+ {
+ }
+
+ JSObject* obj;
+ bool isConfirmedDead;
+};
+
+} // namespace JSC
+
+#endif // LiveObjectData_h
+
Added: trunk/Source/_javascript_Core/heap/LiveObjectList.cpp (0 => 188231)
--- trunk/Source/_javascript_Core/heap/LiveObjectList.cpp (rev 0)
+++ trunk/Source/_javascript_Core/heap/LiveObjectList.cpp 2015-08-10 21:54:36 UTC (rev 188231)
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "LiveObjectList.h"
+
+namespace JSC {
+
+LiveObjectData* LiveObjectList::findObject(JSObject* obj)
+{
+ for (size_t i = 0; i < liveObjects.size(); i++) {
+ LiveObjectData& data = ""
+ if (obj == data.obj)
+ return &data;
+ }
+ return nullptr;
+}
+
+} // namespace JSC
Added: trunk/Source/_javascript_Core/heap/LiveObjectList.h (0 => 188231)
--- trunk/Source/_javascript_Core/heap/LiveObjectList.h (rev 0)
+++ trunk/Source/_javascript_Core/heap/LiveObjectList.h 2015-08-10 21:54:36 UTC (rev 188231)
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef LiveObjectList_h
+#define LiveObjectList_h
+
+#include "LiveObjectData.h"
+#include <wtf/Vector.h>
+
+namespace JSC {
+
+struct LiveObjectList {
+ LiveObjectList(const char* name)
+ : name(name)
+ , hasLiveObjects(true)
+ {
+ }
+
+ void reset()
+ {
+ liveObjects.clear();
+ hasLiveObjects = true; // Presume to have live objects until the list is trimmed.
+ }
+
+ LiveObjectData* findObject(JSObject*);
+
+ const char* name;
+ Vector<LiveObjectData> liveObjects;
+ bool hasLiveObjects;
+};
+
+} // namespace JSC
+
+#endif // LiveObjectList_h
+
