Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (190821 => 190822)
--- trunk/Source/_javascript_Core/ChangeLog 2015-10-09 22:01:16 UTC (rev 190821)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-10-09 22:06:32 UTC (rev 190822)
@@ -1,3 +1,20 @@
+2015-10-09 Joseph Pecoraro <pecor...@apple.com>
+
+ Remove unused RecursiveAllocationScope
+ https://bugs.webkit.org/show_bug.cgi?id=149967
+
+ Reviewed by Csaba Osztrogonác.
+
+ RecursiveAllocationScope has been unused since r163691.
+
+ * _javascript_Core.vcxproj/_javascript_Core.vcxproj:
+ * _javascript_Core.vcxproj/_javascript_Core.vcxproj.filters:
+ * _javascript_Core.xcodeproj/project.pbxproj:
+ * heap/Heap.cpp:
+ * heap/Heap.h:
+ * heap/RecursiveAllocationScope.h: Removed.
+ * runtime/VM.h:
+
2015-10-09 Geoffrey Garen <gga...@apple.com>
Unreviewed, rolling out r190694
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj (190821 => 190822)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj 2015-10-09 22:01:16 UTC (rev 190821)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj 2015-10-09 22:06:32 UTC (rev 190822)
@@ -1375,7 +1375,6 @@
<ClInclude Include="..\heap\MarkedBlockSet.h" />
<ClInclude Include="..\heap\MarkedSpace.h" />
<ClInclude Include="..\heap\MarkStack.h" />
- <ClInclude Include="..\heap\RecursiveAllocationScope.h" />
<ClInclude Include="..\heap\SlotVisitor.h" />
<ClInclude Include="..\heap\SlotVisitorInlines.h" />
<ClInclude Include="..\heap\Strong.h" />
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters (190821 => 190822)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters 2015-10-09 22:01:16 UTC (rev 190821)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters 2015-10-09 22:06:32 UTC (rev 190822)
@@ -2360,9 +2360,6 @@
<ClInclude Include="..\heap\MarkStack.h">
<Filter>heap</Filter>
</ClInclude>
- <ClInclude Include="..\heap\RecursiveAllocationScope.h">
- <Filter>heap</Filter>
- </ClInclude>
<ClInclude Include="..\heap\SlotVisitor.h">
<Filter>heap</Filter>
</ClInclude>
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (190821 => 190822)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2015-10-09 22:01:16 UTC (rev 190821)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2015-10-09 22:06:32 UTC (rev 190822)
@@ -944,7 +944,6 @@
2AABCDE718EF294200002096 /* GCLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AABCDE618EF294200002096 /* GCLogging.h */; settings = {ATTRIBUTES = (Private, ); }; };
2AACE63C18CA5A0300ED0191 /* GCActivityCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AACE63A18CA5A0300ED0191 /* GCActivityCallback.cpp */; };
2AACE63D18CA5A0300ED0191 /* GCActivityCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AACE63B18CA5A0300ED0191 /* GCActivityCallback.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 2AAD964A18569417001F93BE /* RecursiveAllocationScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AAD964918569417001F93BE /* RecursiveAllocationScope.h */; };
2AC922BB18A16182003CE0FB /* FTLDWARFDebugLineInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC922B918A16182003CE0FB /* FTLDWARFDebugLineInfo.cpp */; };
2AC922BC18A16182003CE0FB /* FTLDWARFDebugLineInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC922BA18A16182003CE0FB /* FTLDWARFDebugLineInfo.h */; };
2AD2EDFB19799E38004D6478 /* EnumerationMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AD2EDFA19799E38004D6478 /* EnumerationMode.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -2763,7 +2762,6 @@
2AABCDE618EF294200002096 /* GCLogging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCLogging.h; sourceTree = "<group>"; };
2AACE63A18CA5A0300ED0191 /* GCActivityCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GCActivityCallback.cpp; sourceTree = "<group>"; };
2AACE63B18CA5A0300ED0191 /* GCActivityCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCActivityCallback.h; sourceTree = "<group>"; };
- 2AAD964918569417001F93BE /* RecursiveAllocationScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecursiveAllocationScope.h; sourceTree = "<group>"; };
2AC922B918A16182003CE0FB /* FTLDWARFDebugLineInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FTLDWARFDebugLineInfo.cpp; path = ftl/FTLDWARFDebugLineInfo.cpp; sourceTree = "<group>"; };
2AC922BA18A16182003CE0FB /* FTLDWARFDebugLineInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FTLDWARFDebugLineInfo.h; path = ftl/FTLDWARFDebugLineInfo.h; sourceTree = "<group>"; };
2AD2EDFA19799E38004D6478 /* EnumerationMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EnumerationMode.h; sourceTree = "<group>"; };
@@ -4310,7 +4308,6 @@
142D6F0E13539A4100B02E86 /* MarkStack.cpp */,
142D6F0F13539A4100B02E86 /* MarkStack.h */,
ADDB1F6218D77DB7009B58A8 /* OpaqueRootSet.h */,
- 2AAD964918569417001F93BE /* RecursiveAllocationScope.h */,
C225494215F7DBAA0065E898 /* SlotVisitor.cpp */,
14BA78F013AAB88F005B7C2C /* SlotVisitor.h */,
0FCB408515C0A3C30048932B /* SlotVisitorInlines.h */,
@@ -6798,7 +6795,6 @@
0F0CD4C215F1A6070032F1C0 /* PutDirectIndexMode.h in Headers */,
0F9FC8C514E1B60400D52AE0 /* PutKind.h in Headers */,
147B84630E6DE6B1004775A4 /* PutPropertySlot.h in Headers */,
- 2AAD964A18569417001F93BE /* RecursiveAllocationScope.h in Headers */,
0FF60AC216740F8300029779 /* ReduceWhitespace.h in Headers */,
E33637A61B63220200EE0840 /* ReflectObject.h in Headers */,
0FA7A8EC18B413C80052371D /* Reg.h in Headers */,
Modified: trunk/Source/_javascript_Core/heap/Heap.cpp (190821 => 190822)
--- trunk/Source/_javascript_Core/heap/Heap.cpp 2015-10-09 22:01:16 UTC (rev 190821)
+++ trunk/Source/_javascript_Core/heap/Heap.cpp 2015-10-09 22:06:32 UTC (rev 190822)
@@ -43,7 +43,6 @@
#include "JSONObject.h"
#include "JSCInlines.h"
#include "JSVirtualMachineInternal.h"
-#include "RecursiveAllocationScope.h"
#include "RegExpCache.h"
#include "Tracing.h"
#include "TypeProfilerLog.h"
Modified: trunk/Source/_javascript_Core/heap/Heap.h (190821 => 190822)
--- trunk/Source/_javascript_Core/heap/Heap.h 2015-10-09 22:01:16 UTC (rev 190821)
+++ trunk/Source/_javascript_Core/heap/Heap.h 2015-10-09 22:06:32 UTC (rev 190822)
@@ -253,7 +253,6 @@
friend class MarkedBlock;
friend class CopiedSpace;
friend class CopyVisitor;
- friend class RecursiveAllocationScope;
friend class SlotVisitor;
friend class SuperRegion;
friend class IncrementalSweeper;
Deleted: trunk/Source/_javascript_Core/heap/RecursiveAllocationScope.h (190821 => 190822)
--- trunk/Source/_javascript_Core/heap/RecursiveAllocationScope.h 2015-10-09 22:01:16 UTC (rev 190821)
+++ trunk/Source/_javascript_Core/heap/RecursiveAllocationScope.h 2015-10-09 22:06:32 UTC (rev 190822)
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2013 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. AND ITS CONTRIBUTORS ``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 ITS 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 RecursiveAllocationScope_h
-#define RecursiveAllocationScope_h
-
-#include "Heap.h"
-#include "VM.h"
-
-namespace JSC {
-
-class RecursiveAllocationScope {
-public:
- RecursiveAllocationScope(Heap& heap)
- : m_heap(heap)
-#ifndef NDEBUG
- , m_savedObjectClass(heap.vm()->m_initializingObjectClass)
-#endif
- {
-#ifndef NDEBUG
- m_heap.vm()->m_initializingObjectClass = nullptr;
-#endif
- m_heap.m_deferralDepth++; // Make sure that we don't GC.
- }
-
- ~RecursiveAllocationScope()
- {
- m_heap.m_deferralDepth--; // Decrement deferal manually so we don't GC when we do so since we are already GCing!.
-#ifndef NDEBUG
- m_heap.vm()->m_initializingObjectClass = m_savedObjectClass;
-#endif
- }
-
-private:
- Heap& m_heap;
-#ifndef NDEBUG
- const ClassInfo* m_savedObjectClass;
-#endif
-};
-
-}
-
-#endif // RecursiveAllocationScope_h
Modified: trunk/Source/_javascript_Core/runtime/VM.h (190821 => 190822)
--- trunk/Source/_javascript_Core/runtime/VM.h 2015-10-09 22:01:16 UTC (rev 190821)
+++ trunk/Source/_javascript_Core/runtime/VM.h 2015-10-09 22:06:32 UTC (rev 190822)
@@ -574,7 +574,6 @@
private:
friend class LLIntOffsetsExtractor;
friend class ClearExceptionScope;
- friend class RecursiveAllocationScope;
VM(VMType, HeapType);
static VM*& sharedInstanceInternal();
