Changeset 238346 in webkit


Ignore:
Timestamp:
Nov 17, 2018 2:33:14 AM (5 years ago)
Author:
dinfuehr@igalia.com
Message:

Fix build with disabled DFG/FTL
​https://bugs.webkit.org/show_bug.cgi?id=191256

Reviewed by Yusuke Suzuki.

Fix compilation errors and warnings with both DFG and FTL
disabled at compile-time.

  • bytecode/CodeBlock.cpp:

(JSC::CodeBlock::getICStatusMap):

  • bytecode/InByIdStatus.cpp:

(JSC::InByIdStatus::computeFor):

  • bytecode/PutByIdStatus.cpp:

(JSC::PutByIdStatus::computeFor):
(JSC::PutByIdStatus::hasExitSite): Deleted.

  • bytecode/PutByIdStatus.h:
  • jit/JITOpcodes.cpp:

(JSC::JIT::emit_op_catch):

Location:
trunk/Source/JavaScriptCore
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r238330 r238346  
     12018-11-17  Dominik Infuehr  <dinfuehr@igalia.com>
     2
     3        Fix build with disabled DFG/FTL
     4        https://bugs.webkit.org/show_bug.cgi?id=191256
     5
     6        Reviewed by Yusuke Suzuki.
     7
     8        Fix compilation errors and warnings with both DFG and FTL
     9        disabled at compile-time.
     10
     11        * bytecode/CodeBlock.cpp:
     12        (JSC::CodeBlock::getICStatusMap):
     13        * bytecode/InByIdStatus.cpp:
     14        (JSC::InByIdStatus::computeFor):
     15        * bytecode/PutByIdStatus.cpp:
     16        (JSC::PutByIdStatus::computeFor):
     17        (JSC::PutByIdStatus::hasExitSite): Deleted.
     18        * bytecode/PutByIdStatus.h:
     19        * jit/JITOpcodes.cpp:
     20        (JSC::JIT::emit_op_catch):
     21
    1222018-11-16  Joseph Pecoraro  <pecoraro@apple.com>
    223

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

    r237987 r238346  
    13881388        for (ByValInfo* byValInfo : m_byValInfos)
    13891389            result.add(CodeOrigin(byValInfo->bytecodeIndex), ICStatus()).iterator->value.byValInfo = byValInfo;
     1390#if ENABLE(DFG_JIT)
    13901391        if (JITCode::isOptimizingJIT(jitType())) {
    13911392            DFG::CommonData* dfgCommon = m_jitCode->dfgCommon();
    … …  
    13991400                result.add(pair.first, ICStatus()).iterator->value.inStatus = pair.second.get();
    14001401        }
     1402#endif
    14011403    }
    14021404#else

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

    r234097 r238346  
    9090        };
    9191       
     92#if ENABLE(DFG_JIT)
    9293        if (status.stubInfo) {
    9394            InByIdStatus result;
    … …  
    99100                return bless(result);
    100101        }
     102#endif
    101103       
    102104        if (status.inStatus)

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

    r237547 r238346  
    4848}
    4949
    50 #if ENABLE(DFG_JIT)
    51 ExitFlag PutByIdStatus::hasExitSite(CodeBlock* profiledBlock, unsigned bytecodeIndex)
    52 {
    53     return hasBadCacheExitSite(profiledBlock, bytecodeIndex);
    54 }
    55 #endif
    56 
    5750PutByIdStatus PutByIdStatus::computeFromLLInt(CodeBlock* profiledBlock, unsigned bytecodeIndex, UniquedStringImpl* uid)
    5851{
    … …  
    119112#else // ENABLE(JIT)
    120113    UNUSED_PARAM(map);
     114    UNUSED_PARAM(didExit);
     115    UNUSED_PARAM(callExitSiteData);
    121116    return PutByIdStatus(NoInformation);
    122117#endif // ENABLE(JIT)
    … …  
    245240    CallLinkStatus::ExitSiteData callExitSiteData =
    246241        CallLinkStatus::computeExitSiteData(baselineBlock, codeOrigin.bytecodeIndex);
    247     ExitFlag didExit = hasExitSite(baselineBlock, codeOrigin.bytecodeIndex);
     242    ExitFlag didExit = hasBadCacheExitSite(baselineBlock, codeOrigin.bytecodeIndex);
    248243
    249244    for (ICStatusContext* context : contextStack) {

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

    r234086 r238346  
    126126   
    127127private:
    128 #if ENABLE(DFG_JIT)
    129     static ExitFlag hasExitSite(CodeBlock*, unsigned bytecodeIndex);
    130 #endif
    131128#if ENABLE(JIT)
    132129    static PutByIdStatus computeForStubInfo(

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

    r237547 r238346  
    652652{
    653653    auto bytecode = currentInstruction->as<OpCatch>();
    654     auto& metadata = bytecode.metadata(m_codeBlock);
    655654
    656655    restoreCalleeSavesFromEntryFrameCalleeSavesBuffer(vm()->topEntryFrame);
    … …  
    680679    // https://bugs.webkit.org/show_bug.cgi?id=175598
    681680
     681    auto& metadata = bytecode.metadata(m_codeBlock);
    682682    ValueProfileAndOperandBuffer* buffer = metadata.buffer;
    683683    if (buffer || !shouldEmitProfiling())
Note: See TracChangeset for help on using the changeset viewer.