JavaScriptCore-1097.13.tar.gz

[apple/javascriptcore.git] / interpreter / CachedCall.h

diff --git a/interpreter/CachedCall.h b/interpreter/CachedCall.h
index 04f2210755730040c7e6441dcdc1717337594a6f..ea55d90e580fbb65623726baf02575b8a09b98b8 100644 (file)
--- a/interpreter/CachedCall.h
+++ b/interpreter/CachedCall.h
@@ -35,13 +35,13 @@ namespace JSC {
     class CachedCall {
         WTF_MAKE_NONCOPYABLE(CachedCall); WTF_MAKE_FAST_ALLOCATED;
     public:
     class CachedCall {
         WTF_MAKE_NONCOPYABLE(CachedCall); WTF_MAKE_FAST_ALLOCATED;
     public:

-        CachedCall(CallFrame* callFrame, JSFunction* function, int argCount)
+        CachedCall(CallFrame* callFrame, JSFunction* function, int argumentCount)

             : m_valid(false)
             , m_interpreter(callFrame->interpreter())
             , m_globalObjectScope(callFrame->globalData(), function->scope()->globalObject.get())
         {
             ASSERT(!function->isHostFunction());
             : m_valid(false)
             , m_interpreter(callFrame->interpreter())
             , m_globalObjectScope(callFrame->globalData(), function->scope()->globalObject.get())
         {
             ASSERT(!function->isHostFunction());

-            m_closure = m_interpreter->prepareForRepeatCall(function->jsExecutable(), callFrame, function, argCount, function->scope());
+            m_closure = m_interpreter->prepareForRepeatCall(function->jsExecutable(), callFrame, function, argumentCount + 1, function->scope());

             m_valid = !callFrame->hadException();
         }
         
             m_valid = !callFrame->hadException();
         }
         


@@ -50,8 +50,8 @@ namespace JSC {
             ASSERT(m_valid);
             return m_interpreter->execute(m_closure);
         }
             ASSERT(m_valid);
             return m_interpreter->execute(m_closure);
         }

-        void setThis(JSValue v) { m_closure.setArgument(0, v); }
-        void setArgument(int n, JSValue v) { m_closure.setArgument(n + 1, v); }
+        void setThis(JSValue v) { m_closure.setThis(v); }
+        void setArgument(int n, JSValue v) { m_closure.setArgument(n, v); }

 
         CallFrame* newCallFrame(ExecState* exec)
         {
 
         CallFrame* newCallFrame(ExecState* exec)
         {