diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/JavaScriptCore/jit/JITDriver.h | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/JavaScriptCore/jit/JITDriver.h')
| -rw-r--r-- | Source/JavaScriptCore/jit/JITDriver.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/JavaScriptCore/jit/JITDriver.h b/Source/JavaScriptCore/jit/JITDriver.h index 645c65b28..a2221fa0f 100644 --- a/Source/JavaScriptCore/jit/JITDriver.h +++ b/Source/JavaScriptCore/jit/JITDriver.h @@ -40,12 +40,12 @@ namespace JSC { template<typename CodeBlockType> inline bool jitCompileIfAppropriate(ExecState* exec, OwnPtr<CodeBlockType>& codeBlock, JITCode& jitCode, JITCode::JITType jitType, unsigned bytecodeIndex, JITCompilationEffort effort) { - JSGlobalData& globalData = exec->globalData(); + VM& vm = exec->vm(); if (jitType == codeBlock->getJITType()) return true; - if (!globalData.canUseJIT()) + if (!vm.canUseJIT()) return true; codeBlock->unlinkIncomingCalls(); @@ -64,7 +64,7 @@ inline bool jitCompileIfAppropriate(ExecState* exec, OwnPtr<CodeBlockType>& code jitCode = oldJITCode; return false; } - jitCode = JIT::compile(&globalData, codeBlock.get(), effort); + jitCode = JIT::compile(&vm, codeBlock.get(), effort); if (!jitCode) { jitCode = oldJITCode; return false; @@ -77,12 +77,12 @@ inline bool jitCompileIfAppropriate(ExecState* exec, OwnPtr<CodeBlockType>& code inline bool jitCompileFunctionIfAppropriate(ExecState* exec, OwnPtr<FunctionCodeBlock>& codeBlock, JITCode& jitCode, MacroAssemblerCodePtr& jitCodeWithArityCheck, JITCode::JITType jitType, unsigned bytecodeIndex, JITCompilationEffort effort) { - JSGlobalData& globalData = exec->globalData(); + VM& vm = exec->vm(); if (jitType == codeBlock->getJITType()) return true; - if (!globalData.canUseJIT()) + if (!vm.canUseJIT()) return true; codeBlock->unlinkIncomingCalls(); @@ -103,7 +103,7 @@ inline bool jitCompileFunctionIfAppropriate(ExecState* exec, OwnPtr<FunctionCode jitCodeWithArityCheck = oldJITCodeWithArityCheck; return false; } - jitCode = JIT::compile(&globalData, codeBlock.get(), effort, &jitCodeWithArityCheck); + jitCode = JIT::compile(&vm, codeBlock.get(), effort, &jitCodeWithArityCheck); if (!jitCode) { jitCode = oldJITCode; jitCodeWithArityCheck = oldJITCodeWithArityCheck; |