From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/JavaScriptCore/dfg/DFGOSRExitPreparation.cpp | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'Source/JavaScriptCore/dfg/DFGOSRExitPreparation.cpp') diff --git a/Source/JavaScriptCore/dfg/DFGOSRExitPreparation.cpp b/Source/JavaScriptCore/dfg/DFGOSRExitPreparation.cpp index 98e58a101..646c7e405 100644 --- a/Source/JavaScriptCore/dfg/DFGOSRExitPreparation.cpp +++ b/Source/JavaScriptCore/dfg/DFGOSRExitPreparation.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Apple Inc. All rights reserved. + * Copyright (C) 2013, 2014 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -29,10 +29,10 @@ #if ENABLE(DFG_JIT) #include "CodeBlock.h" -#include "Executable.h" #include "JIT.h" #include "JITCode.h" -#include "Operations.h" +#include "JITWorklist.h" +#include "JSCInlines.h" namespace JSC { namespace DFG { @@ -41,17 +41,9 @@ void prepareCodeOriginForOSRExit(ExecState* exec, CodeOrigin codeOrigin) VM& vm = exec->vm(); DeferGC deferGC(vm.heap); - for (; codeOrigin.inlineCallFrame; codeOrigin = codeOrigin.inlineCallFrame->caller) { - FunctionExecutable* executable = - static_cast(codeOrigin.inlineCallFrame->executable.get()); - CodeBlock* codeBlock = executable->baselineCodeBlockFor( - codeOrigin.inlineCallFrame->isCall ? CodeForCall : CodeForConstruct); - - if (codeBlock->jitType() == JSC::JITCode::BaselineJIT) - continue; - ASSERT(codeBlock->jitType() == JSC::JITCode::InterpreterThunk); - JIT::compile(&vm, codeBlock, JITCompilationMustSucceed); - codeBlock->install(); + for (; codeOrigin.inlineCallFrame; codeOrigin = codeOrigin.inlineCallFrame->directCaller) { + CodeBlock* codeBlock = codeOrigin.inlineCallFrame->baselineCodeBlock.get(); + JITWorklist::instance()->compileNow(codeBlock); } } -- cgit v1.2.1