JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / interpreter / ProtoCallFrame.cpp

diff --git a/interpreter/ProtoCallFrame.cpp b/interpreter/ProtoCallFrame.cpp
index 5d6ae0f4f1d1f07bf6ff09f883bd3641ed81a803..eb80b2c2336456eabc8c83c1ad4ed589d238c15b 100644 (file)
--- a/interpreter/ProtoCallFrame.cpp
+++ b/interpreter/ProtoCallFrame.cpp
@@ -32,21 +32,19 @@
 
 namespace JSC {
 
 
 namespace JSC {
 

-void ProtoCallFrame::init(CodeBlock* codeBlock, JSScope* scope, JSObject* callee, JSValue thisValue, int argCountIncludingThis, JSValue* otherArgs)
+void ProtoCallFrame::init(CodeBlock* codeBlock, JSObject* callee, JSValue thisValue, int argCountIncludingThis, JSValue* otherArgs)

 {
     this->args = otherArgs;
     this->setCodeBlock(codeBlock);
 {
     this->args = otherArgs;
     this->setCodeBlock(codeBlock);

-    this->setScope(scope);

     this->setCallee(callee);
     this->setArgumentCountIncludingThis(argCountIncludingThis);
     this->setCallee(callee);
     this->setArgumentCountIncludingThis(argCountIncludingThis);

-    size_t paddedArgsCount = argCountIncludingThis;
-    if (codeBlock) {
-        size_t numParameters = codeBlock->numParameters();
-        if (paddedArgsCount < numParameters)
-            paddedArgsCount = numParameters;
-    }
-    // Round up paddedArgsCount to keep the stack frame size aligned.
-    paddedArgsCount = roundArgumentCountToAlignFrame(paddedArgsCount);
+    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);
     this->clearCurrentVPC();
     this->setThisValue(thisValue);
     this->setPaddedArgCount(paddedArgsCount);
     this->clearCurrentVPC();
     this->setThisValue(thisValue);