Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (265141 => 265142)
--- trunk/Source/_javascript_Core/ChangeLog 2020-07-31 15:54:30 UTC (rev 265141)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-07-31 16:00:27 UTC (rev 265142)
@@ -1,3 +1,31 @@
+2020-07-31 Keith Miller <[email protected]>
+
+ Reduce over include usage in JSC
+ https://bugs.webkit.org/show_bug.cgi?id=215010
+
+ Reviewed by Mark Lam.
+
+ My first attempt to fix
+ https://bugs.webkit.org/show_bug.cgi?id=215009 by making it so we
+ don't include FastJITPermissions.h in TestWebKitAPI, was
+ unsuccessful. Mostly because I gave up after several hours of
+ building... I figure it's still worth it to land the last working
+ version I was able to get building.
+
+ * assembler/MacroAssemblerCodeRef.h:
+ * bytecode/CodeBlock.cpp:
+ * bytecode/PolymorphicAccess.h:
+ * inspector/agents/InspectorRuntimeAgent.cpp:
+ * interpreter/CallFrame.h:
+ * jit/ThunkGenerators.cpp:
+ * llint/LLIntOffsetsExtractor.cpp:
+ * runtime/TypeLocationCache.cpp:
+ * runtime/VM.cpp:
+ (JSC::VM::getCTIStub):
+ * runtime/VM.h:
+ (JSC::VM::getCTIStub): Deleted.
+ * tools/JSDollarVM.cpp:
+
2020-07-31 Yusuke Suzuki <[email protected]>
[JSC] Follow-up changes after r265036
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h (265141 => 265142)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h 2020-07-31 15:54:30 UTC (rev 265141)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h 2020-07-31 16:00:27 UTC (rev 265142)
@@ -25,9 +25,9 @@
#pragma once
-#include "ExecutableAllocator.h"
#include "JSCPtrTag.h"
#include <wtf/DataLog.h>
+#include <wtf/MetaAllocatorHandle.h>
#include <wtf/PrintStream.h>
#include <wtf/RefPtr.h>
#include <wtf/text/CString.h>
@@ -54,6 +54,7 @@
namespace JSC {
+typedef WTF::MetaAllocatorHandle ExecutableMemoryHandle;
template<PtrTag> class MacroAssemblerCodePtr;
enum OpcodeID : unsigned;
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (265141 => 265142)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2020-07-31 15:54:30 UTC (rev 265141)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2020-07-31 16:00:27 UTC (rev 265142)
@@ -39,6 +39,7 @@
#include "BytecodeStructs.h"
#include "CodeBlockInlines.h"
#include "CodeBlockSet.h"
+#include "ControlFlowProfiler.h"
#include "DFGCapabilities.h"
#include "DFGCommon.h"
#include "DFGJITCode.h"
Modified: trunk/Source/_javascript_Core/bytecode/PolymorphicAccess.h (265141 => 265142)
--- trunk/Source/_javascript_Core/bytecode/PolymorphicAccess.h 2020-07-31 15:54:30 UTC (rev 265141)
+++ trunk/Source/_javascript_Core/bytecode/PolymorphicAccess.h 2020-07-31 16:00:27 UTC (rev 265142)
@@ -39,6 +39,7 @@
class GetterSetter;
}
+class CCallHelpers;
class CodeBlock;
class PolymorphicAccess;
class StructureStubInfo;
Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorRuntimeAgent.cpp (265141 => 265142)
--- trunk/Source/_javascript_Core/inspector/agents/InspectorRuntimeAgent.cpp 2020-07-31 15:54:30 UTC (rev 265141)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorRuntimeAgent.cpp 2020-07-31 16:00:27 UTC (rev 265142)
@@ -33,6 +33,7 @@
#include "InspectorRuntimeAgent.h"
#include "Completion.h"
+#include "ControlFlowProfiler.h"
#include "InjectedScript.h"
#include "InjectedScriptHost.h"
#include "InjectedScriptManager.h"
Modified: trunk/Source/_javascript_Core/interpreter/CallFrame.cpp (265141 => 265142)
--- trunk/Source/_javascript_Core/interpreter/CallFrame.cpp 2020-07-31 15:54:30 UTC (rev 265141)
+++ trunk/Source/_javascript_Core/interpreter/CallFrame.cpp 2020-07-31 16:00:27 UTC (rev 265142)
@@ -32,6 +32,7 @@
#include "JSCInlines.h"
#include "JSWebAssemblyInstance.h"
#include "LLIntPCRanges.h"
+#include "VMEntryRecord.h"
#include "WasmContextInlines.h"
#include "WasmInstance.h"
#include <wtf/StringPrintStream.h>
Modified: trunk/Source/_javascript_Core/interpreter/CallFrame.h (265141 => 265142)
--- trunk/Source/_javascript_Core/interpreter/CallFrame.h 2020-07-31 15:54:30 UTC (rev 265141)
+++ trunk/Source/_javascript_Core/interpreter/CallFrame.h 2020-07-31 16:00:27 UTC (rev 265142)
@@ -28,7 +28,6 @@
#include "Register.h"
#include "StackVisitor.h"
#include "VM.h"
-#include "VMEntryRecord.h"
#include <wtf/EnumClassOperatorOverloads.h>
namespace JSC {
Modified: trunk/Source/_javascript_Core/jit/ThunkGenerators.cpp (265141 => 265142)
--- trunk/Source/_javascript_Core/jit/ThunkGenerators.cpp 2020-07-31 15:54:30 UTC (rev 265141)
+++ trunk/Source/_javascript_Core/jit/ThunkGenerators.cpp 2020-07-31 16:00:27 UTC (rev 265142)
@@ -27,6 +27,7 @@
#include "ThunkGenerators.h"
#include "JITOperations.h"
+#include "JITThunks.h"
#include "JSBoundFunction.h"
#include "MaxFrameExtentForSlowPathCall.h"
#include "SpecializedThunkJIT.h"
Modified: trunk/Source/_javascript_Core/llint/LLIntOffsetsExtractor.cpp (265141 => 265142)
--- trunk/Source/_javascript_Core/llint/LLIntOffsetsExtractor.cpp 2020-07-31 15:54:30 UTC (rev 265141)
+++ trunk/Source/_javascript_Core/llint/LLIntOffsetsExtractor.cpp 2020-07-31 16:00:27 UTC (rev 265142)
@@ -31,6 +31,7 @@
#include "BytecodeStructs.h"
#include "CodeBlock.h"
#include "CommonSlowPaths.h"
+#include "ControlFlowProfiler.h"
#include "DirectArguments.h"
#include "DirectEvalExecutable.h"
#include "EvalExecutable.h"
Modified: trunk/Source/_javascript_Core/runtime/TypeLocationCache.cpp (265141 => 265142)
--- trunk/Source/_javascript_Core/runtime/TypeLocationCache.cpp 2020-07-31 15:54:30 UTC (rev 265141)
+++ trunk/Source/_javascript_Core/runtime/TypeLocationCache.cpp 2020-07-31 16:00:27 UTC (rev 265142)
@@ -27,6 +27,7 @@
#include "config.h"
#include "TypeLocationCache.h"
+#include "ControlFlowProfiler.h"
#include "TypeProfiler.h"
#include "VM.h"
Modified: trunk/Source/_javascript_Core/runtime/VM.cpp (265141 => 265142)
--- trunk/Source/_javascript_Core/runtime/VM.cpp 2020-07-31 15:54:30 UTC (rev 265141)
+++ trunk/Source/_javascript_Core/runtime/VM.cpp 2020-07-31 16:00:27 UTC (rev 265142)
@@ -40,6 +40,7 @@
#include "CodeBlock.h"
#include "CodeCache.h"
#include "CommonIdentifiers.h"
+#include "ControlFlowProfiler.h"
#include "CustomGetterSetter.h"
#include "DFGWorklist.h"
#include "DOMAttributeGetterSetter.h"
@@ -74,6 +75,7 @@
#include "IsoHeapCellType.h"
#include "IsoInlinedHeapCellType.h"
#include "JITCode.h"
+#include "JITThunks.h"
#include "JITWorklist.h"
#include "JSAPIGlobalObject.h"
#include "JSAPIValueWrapper.h"
@@ -790,6 +792,11 @@
}
}
+MacroAssemblerCodeRef<JITThunkPtrTag> VM::getCTIStub(ThunkGenerator generator)
+{
+ return jitStubs->ctiStub(*this, generator);
+}
+
#endif // ENABLE(JIT)
NativeExecutable* VM::getHostFunction(NativeFunction function, NativeFunction constructor, const String& name)
Modified: trunk/Source/_javascript_Core/runtime/VM.h (265141 => 265142)
--- trunk/Source/_javascript_Core/runtime/VM.h 2020-07-31 15:54:30 UTC (rev 265141)
+++ trunk/Source/_javascript_Core/runtime/VM.h 2020-07-31 16:00:27 UTC (rev 265142)
@@ -32,12 +32,10 @@
#include "CodeSpecializationKind.h"
#include "CompleteSubspace.h"
#include "ConcurrentJSLock.h"
-#include "ControlFlowProfiler.h"
#include "DateInstanceCache.h"
#include "DeleteAllCodeEffort.h"
#include "DisallowVMEntry.h"
#include "ExceptionEventLocation.h"
-#include "ExecutableAllocator.h"
#include "FunctionHasExecutedCache.h"
#include "FuzzerAgent.h"
#include "Heap.h"
@@ -45,7 +43,6 @@
#include "Intrinsic.h"
#include "IsoCellSet.h"
#include "IsoSubspace.h"
-#include "JITThunks.h"
#include "JSCJSValue.h"
#include "JSLock.h"
#include "MacroAssemblerCodeRef.h"
@@ -55,6 +52,7 @@
#include "Strong.h"
#include "StructureCache.h"
#include "SubspaceAccess.h"
+#include "ThunkGenerator.h"
#include "VMTraps.h"
#include "WasmContext.h"
#include "Watchpoint.h"
@@ -102,6 +100,7 @@
namespace JSC {
+class BasicBlockLocation;
class BuiltinExecutables;
class BytecodeIntrinsicRegistry;
class CallFrame;
@@ -111,6 +110,7 @@
class CommonIdentifiers;
class CompactVariableMap;
class ConservativeRoots;
+class ControlFlowProfiler;
class CustomGetterSetter;
class DOMAttributeGetterSetter;
class DateInstance;
@@ -120,8 +120,6 @@
class FastMallocAlignedMemoryAllocator;
class GigacageAlignedMemoryAllocator;
class HandleStack;
-class TypeProfiler;
-class TypeProfilerLog;
class HasOwnPropertyCache;
class HeapProfiler;
class Identifier;
@@ -158,6 +156,7 @@
class JSWebAssemblyMemory;
class JSWebAssemblyModule;
class JSWebAssemblyTable;
+class JITThunks;
class LLIntOffsetsExtractor;
class NativeExecutable;
class ObjCCallbackFunction;
@@ -188,6 +187,8 @@
class VirtualRegister;
class VMEntryScope;
class TopLevelGlobalObjectScope;
+class TypeProfiler;
+class TypeProfilerLog;
class Watchdog;
class Watchpoint;
class WatchpointSet;
@@ -814,10 +815,7 @@
Interpreter* interpreter;
#if ENABLE(JIT)
std::unique_ptr<JITThunks> jitStubs;
- MacroAssemblerCodeRef<JITThunkPtrTag> getCTIStub(ThunkGenerator generator)
- {
- return jitStubs->ctiStub(*this, generator);
- }
+ MacroAssemblerCodeRef<JITThunkPtrTag> getCTIStub(ThunkGenerator);
#endif // ENABLE(JIT)
#if ENABLE(FTL_JIT)
Modified: trunk/Source/_javascript_Core/tools/JSDollarVM.cpp (265141 => 265142)
--- trunk/Source/_javascript_Core/tools/JSDollarVM.cpp 2020-07-31 15:54:30 UTC (rev 265141)
+++ trunk/Source/_javascript_Core/tools/JSDollarVM.cpp 2020-07-31 16:00:27 UTC (rev 265142)
@@ -29,6 +29,7 @@
#include "ArrayPrototype.h"
#include "BuiltinNames.h"
#include "CodeBlock.h"
+#include "ControlFlowProfiler.h"
#include "DOMAttributeGetterSetter.h"
#include "DOMJITGetterSetter.h"
#include "Debugger.h"