From 41386e9cb918eed93b3f13648cbef387e371e451 Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Wed, 20 May 2015 09:56:07 +0000 Subject: webkitgtk-2.4.9 --- Source/JavaScriptCore/interpreter/ProtoCallFrame.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'Source/JavaScriptCore/interpreter/ProtoCallFrame.cpp') diff --git a/Source/JavaScriptCore/interpreter/ProtoCallFrame.cpp b/Source/JavaScriptCore/interpreter/ProtoCallFrame.cpp index eb80b2c23..a36001437 100644 --- a/Source/JavaScriptCore/interpreter/ProtoCallFrame.cpp +++ b/Source/JavaScriptCore/interpreter/ProtoCallFrame.cpp @@ -27,25 +27,23 @@ #include "ProtoCallFrame.h" #include "CodeBlock.h" -#include "JSCInlines.h" -#include "StackAlignment.h" namespace JSC { -void ProtoCallFrame::init(CodeBlock* codeBlock, JSObject* callee, JSValue thisValue, int argCountIncludingThis, JSValue* otherArgs) +void ProtoCallFrame::init(CodeBlock* codeBlock, JSScope* scope, JSObject* callee, JSValue thisValue, int argCountIncludingThis, JSValue* otherArgs) { this->args = otherArgs; this->setCodeBlock(codeBlock); + this->setScope(scope); this->setCallee(callee); this->setArgumentCountIncludingThis(argCountIncludingThis); - if (codeBlock && argCountIncludingThis < codeBlock->numParameters()) - this->arityMissMatch = true; - else - this->arityMissMatch = false; - - // Round up argCountIncludingThis to keep the stack frame size aligned. - size_t paddedArgsCount = roundArgumentCountToAlignFrame(argCountIncludingThis); - this->setPaddedArgCount(paddedArgsCount); + size_t paddedArgsCount = argCountIncludingThis; + if (codeBlock) { + size_t numParameters = codeBlock->numParameters(); + if (paddedArgsCount < numParameters) + paddedArgsCount = numParameters; + } + this->setPaddedArgsCount(paddedArgsCount); this->clearCurrentVPC(); this->setThisValue(thisValue); } -- cgit v1.2.1