Changeset 265142 in webkit


Ignore:
Timestamp:
Jul 31, 2020 9:00:27 AM (4 years ago)
Author:
keith_miller@apple.com
Message:

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:
Location:
trunk/Source/JavaScriptCore
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r265136 r265142  
     12020-07-31  Keith Miller  <keith_miller@apple.com>
     2
     3        Reduce over include usage in JSC
     4        https://bugs.webkit.org/show_bug.cgi?id=215010
     5
     6        Reviewed by Mark Lam.
     7
     8        My first attempt to fix
     9        https://bugs.webkit.org/show_bug.cgi?id=215009 by making it so we
     10        don't include FastJITPermissions.h in TestWebKitAPI, was
     11        unsuccessful. Mostly because I gave up after several hours of
     12        building... I figure it's still worth it to land the last working
     13        version I was able to get building.
     14
     15        * assembler/MacroAssemblerCodeRef.h:
     16        * bytecode/CodeBlock.cpp:
     17        * bytecode/PolymorphicAccess.h:
     18        * inspector/agents/InspectorRuntimeAgent.cpp:
     19        * interpreter/CallFrame.h:
     20        * jit/ThunkGenerators.cpp:
     21        * llint/LLIntOffsetsExtractor.cpp:
     22        * runtime/TypeLocationCache.cpp:
     23        * runtime/VM.cpp:
     24        (JSC::VM::getCTIStub):
     25        * runtime/VM.h:
     26        (JSC::VM::getCTIStub): Deleted.
     27        * tools/JSDollarVM.cpp:
     28
    1292020-07-31  Yusuke Suzuki  <ysuzuki@apple.com>
    230

  • trunk/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h

    r264488 r265142  
    2626#pragma once
    2727
    28 #include "ExecutableAllocator.h"
    2928#include "JSCPtrTag.h"
    3029#include <wtf/DataLog.h>
     30#include <wtf/MetaAllocatorHandle.h>
    3131#include <wtf/PrintStream.h>
    3232#include <wtf/RefPtr.h>
    … …  
    5555namespace JSC {
    5656
     57typedef WTF::MetaAllocatorHandle ExecutableMemoryHandle;
    5758template<PtrTag> class MacroAssemblerCodePtr;
    5859

  • trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

    r265000 r265142  
    4040#include "CodeBlockInlines.h"
    4141#include "CodeBlockSet.h"
     42#include "ControlFlowProfiler.h"
    4243#include "DFGCapabilities.h"
    4344#include "DFGCommon.h"

  • trunk/Source/JavaScriptCore/bytecode/PolymorphicAccess.h

    r263134 r265142  
    4040}
    4141
     42class CCallHelpers;
    4243class CodeBlock;
    4344class PolymorphicAccess;

  • trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp

    r261755 r265142  
    3434
    3535#include "Completion.h"
     36#include "ControlFlowProfiler.h"
    3637#include "InjectedScript.h"
    3738#include "InjectedScriptHost.h"

  • trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp

    r264051 r265142  
    3333#include "JSWebAssemblyInstance.h"
    3434#include "LLIntPCRanges.h"
     35#include "VMEntryRecord.h"
    3536#include "WasmContextInlines.h"
    3637#include "WasmInstance.h"

  • trunk/Source/JavaScriptCore/interpreter/CallFrame.h

    r264051 r265142  
    2929#include "StackVisitor.h"
    3030#include "VM.h"
    31 #include "VMEntryRecord.h"
    3231#include <wtf/EnumClassOperatorOverloads.h>
    3332

  • trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp

    r263134 r265142  
    2828
    2929#include "JITOperations.h"
     30#include "JITThunks.h"
    3031#include "JSBoundFunction.h"
    3132#include "MaxFrameExtentForSlowPathCall.h"

  • trunk/Source/JavaScriptCore/llint/LLIntOffsetsExtractor.cpp

    r262613 r265142  
    3232#include "CodeBlock.h"
    3333#include "CommonSlowPaths.h"
     34#include "ControlFlowProfiler.h"
    3435#include "DirectArguments.h"
    3536#include "DirectEvalExecutable.h"

  • trunk/Source/JavaScriptCore/runtime/TypeLocationCache.cpp

    r212365 r265142  
    2828#include "TypeLocationCache.h"
    2929
     30#include "ControlFlowProfiler.h"
    3031#include "TypeProfiler.h"
    3132#include "VM.h"

  • trunk/Source/JavaScriptCore/runtime/VM.cpp

    r264696 r265142  
    4141#include "CodeCache.h"
    4242#include "CommonIdentifiers.h"
     43#include "ControlFlowProfiler.h"
    4344#include "CustomGetterSetter.h"
    4445#include "DFGWorklist.h"
    … …  
    7576#include "IsoInlinedHeapCellType.h"
    7677#include "JITCode.h"
     78#include "JITThunks.h"
    7779#include "JITWorklist.h"
    7880#include "JSAPIGlobalObject.h"
    … …  
    791793}
    792794
     795MacroAssemblerCodeRef<JITThunkPtrTag> VM::getCTIStub(ThunkGenerator generator)
     796{
     797    return jitStubs->ctiStub(*this, generator);
     798}
     799
    793800#endif // ENABLE(JIT)
    794801

  • trunk/Source/JavaScriptCore/runtime/VM.h

    r264696 r265142  
    3333#include "CompleteSubspace.h"
    3434#include "ConcurrentJSLock.h"
    35 #include "ControlFlowProfiler.h"
    3635#include "DateInstanceCache.h"
    3736#include "DeleteAllCodeEffort.h"
    3837#include "DisallowVMEntry.h"
    3938#include "ExceptionEventLocation.h"
    40 #include "ExecutableAllocator.h"
    4139#include "FunctionHasExecutedCache.h"
    4240#include "FuzzerAgent.h"
    … …  
    4644#include "IsoCellSet.h"
    4745#include "IsoSubspace.h"
    48 #include "JITThunks.h"
    4946#include "JSCJSValue.h"
    5047#include "JSLock.h"
    … …  
    5653#include "StructureCache.h"
    5754#include "SubspaceAccess.h"
     55#include "ThunkGenerator.h"
    5856#include "VMTraps.h"
    5957#include "WasmContext.h"
    … …  
    103101namespace JSC {
    104102
     103class BasicBlockLocation;
    105104class BuiltinExecutables;
    106105class BytecodeIntrinsicRegistry;
    … …  
    112111class CompactVariableMap;
    113112class ConservativeRoots;
     113class ControlFlowProfiler;
    114114class CustomGetterSetter;
    115115class DOMAttributeGetterSetter;
    … …  
    121121class GigacageAlignedMemoryAllocator;
    122122class HandleStack;
    123 class TypeProfiler;
    124 class TypeProfilerLog;
    125123class HasOwnPropertyCache;
    126124class HeapProfiler;
    … …  
    159157class JSWebAssemblyModule;
    160158class JSWebAssemblyTable;
     159class JITThunks;
    161160class LLIntOffsetsExtractor;
    162161class NativeExecutable;
    … …  
    189188class VMEntryScope;
    190189class TopLevelGlobalObjectScope;
     190class TypeProfiler;
     191class TypeProfilerLog;
    191192class Watchdog;
    192193class Watchpoint;
    … …  
    815816#if ENABLE(JIT)
    816817    std::unique_ptr<JITThunks> jitStubs;
    817     MacroAssemblerCodeRef<JITThunkPtrTag> getCTIStub(ThunkGenerator generator)
    818     {
    819         return jitStubs->ctiStub(*this, generator);
    820     }
     818    MacroAssemblerCodeRef<JITThunkPtrTag> getCTIStub(ThunkGenerator);
    821819
    822820#endif // ENABLE(JIT)

  • trunk/Source/JavaScriptCore/tools/JSDollarVM.cpp

    r264736 r265142  
    3030#include "BuiltinNames.h"
    3131#include "CodeBlock.h"
     32#include "ControlFlowProfiler.h"
    3233#include "DOMAttributeGetterSetter.h"
    3334#include "DOMJITGetterSetter.h"
Note: See TracChangeset for help on using the changeset viewer.