JavaScriptCore-1218.33.tar.gz

[apple/javascriptcore.git] / runtime / PropertySlot.cpp

diff --git a/runtime/PropertySlot.cpp b/runtime/PropertySlot.cpp
index fd16c0c092b740e99fd91b3ec34a7527cfc1de48..291ea487ca792d3c083c8871bcc4b63bce41a3db 100644 (file)
--- a/runtime/PropertySlot.cpp
+++ b/runtime/PropertySlot.cpp
@@ -23,6 +23,7 @@
 
 #include "JSFunction.h"
 #include "JSGlobalObject.h"
+#include "Operations.h"
 
 namespace JSC {
 
@@ -33,8 +34,8 @@ JSValue PropertySlot::functionGetter(ExecState* exec) const
         return exec->exception();
 
     CallData callData;
-    CallType callType = m_data.getterFunc->getCallData(callData);
-    return call(exec, m_data.getterFunc, callType, callData, thisValue(), exec->emptyList());
+    CallType callType = m_data.getterFunc->methodTable()->getCallData(m_data.getterFunc, callData);
+    return call(exec, m_data.getterFunc, callType, callData, m_thisValue.isObject() ? m_thisValue.toThisObject(exec) : m_thisValue, exec->emptyList());
 }
 
 } // namespace JSC