From 5ea819f80c6840c492386bfafbffb059c7e2091f Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 23 Oct 2012 10:25:11 +0200 Subject: Imported WebKit commit 20434eb8eb95065803473139d8794e98a7672f75 (http://svn.webkit.org/repository/webkit/trunk@132191) New snapshot that should fix build with latest qtbase and the QPlastiqueStyle removal --- Source/JavaScriptCore/dfg/DFGOperations.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'Source/JavaScriptCore/dfg/DFGOperations.cpp') diff --git a/Source/JavaScriptCore/dfg/DFGOperations.cpp b/Source/JavaScriptCore/dfg/DFGOperations.cpp index 11c2c1cef..13e04388c 100644 --- a/Source/JavaScriptCore/dfg/DFGOperations.cpp +++ b/Source/JavaScriptCore/dfg/DFGOperations.cpp @@ -1165,20 +1165,24 @@ JSCell* DFG_OPERATION operationCreateActivation(ExecState* exec) JSCell* DFG_OPERATION operationCreateArguments(ExecState* exec) { + JSGlobalData& globalData = exec->globalData(); + NativeCallFrameTracer tracer(&globalData, exec); // NB: This needs to be exceedingly careful with top call frame tracking, since it // may be called from OSR exit, while the state of the call stack is bizarre. - Arguments* result = Arguments::create(exec->globalData(), exec); - ASSERT(!exec->globalData().exception); + Arguments* result = Arguments::create(globalData, exec); + ASSERT(!globalData.exception); return result; } JSCell* DFG_OPERATION operationCreateInlinedArguments( ExecState* exec, InlineCallFrame* inlineCallFrame) { + JSGlobalData& globalData = exec->globalData(); + NativeCallFrameTracer tracer(&globalData, exec); // NB: This needs to be exceedingly careful with top call frame tracking, since it // may be called from OSR exit, while the state of the call stack is bizarre. - Arguments* result = Arguments::create(exec->globalData(), exec, inlineCallFrame); - ASSERT(!exec->globalData().exception); + Arguments* result = Arguments::create(globalData, exec, inlineCallFrame); + ASSERT(!globalData.exception); return result; } -- cgit v1.2.1