Skip to content
Permalink
Browse files
Fix compilation when MASM_PROBE (and therefore DFG) are disabled
https://bugs.webkit.org/show_bug.cgi?id=178134

Reviewed by Saam Barati.

* bytecode/CodeBlock.cpp:
* bytecode/CodeBlock.h:
Disable some code when building without DFG_JIT.


Canonical link: https://commits.webkit.org/194398@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@223155 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
guijemont committed Oct 10, 2017
1 parent 7aa0cc1 commit 0119fba5f42069f261dc25ca5cd44354e6173e1e
Showing 3 changed files with 17 additions and 0 deletions.
@@ -1,3 +1,14 @@
2017-10-10 Guillaume Emont <guijemont@igalia.com>

Fix compilation when MASM_PROBE (and therefore DFG) are disabled
https://bugs.webkit.org/show_bug.cgi?id=178134

Reviewed by Saam Barati.

* bytecode/CodeBlock.cpp:
* bytecode/CodeBlock.h:
Disable some code when building without DFG_JIT.

2017-10-10 Sam Weinig <sam@webkit.org>

Replace copyKeysToVector/copyValuesToVector with copyToVector(map.keys())/copyToVector(map.values())
@@ -2320,6 +2320,7 @@ bool CodeBlock::checkIfOptimizationThresholdReached()
return m_jitExecuteCounter.checkIfThresholdCrossedAndSet(this);
}

#if ENABLE(DFG_JIT)
auto CodeBlock::updateOSRExitCounterAndCheckIfNeedToReoptimize(DFG::OSRExitState& exitState) -> OptimizeAction
{
DFG::OSRExitBase& exit = exitState.exit;
@@ -2366,6 +2367,7 @@ auto CodeBlock::updateOSRExitCounterAndCheckIfNeedToReoptimize(DFG::OSRExitState
baselineCodeBlock->m_jitExecuteCounter.setNewThresholdForOSRExit(exitState.activeThreshold, exitState.memoryUsageAdjustedThreshold);
return OptimizeAction::None;
}
#endif

void CodeBlock::optimizeNextInvocation()
{
@@ -77,9 +77,11 @@

namespace JSC {

#if ENABLE(DFG_JIT)
namespace DFG {
struct OSRExitState;
} // namespace DFG
#endif

class BytecodeLivenessAnalysis;
class CodeBlockSet;
@@ -767,7 +769,9 @@ class CodeBlock : public JSCell {
void countOSRExit() { m_osrExitCounter++; }

enum class OptimizeAction { None, ReoptimizeNow };
#if ENABLE(DFG_JIT)
OptimizeAction updateOSRExitCounterAndCheckIfNeedToReoptimize(DFG::OSRExitState&);
#endif

static ptrdiff_t offsetOfOSRExitCounter() { return OBJECT_OFFSETOF(CodeBlock, m_osrExitCounter); }

0 comments on commit 0119fba

Please sign in to comment.