JavaScriptCore-7600.1.4.11.8.tar.gz

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

diff --git a/runtime/GetterSetter.cpp b/runtime/GetterSetter.cpp
index 7e54053f96cce73b5560a82e5e810e1e5d280f6c..3de956ac6624633d05732c034e97b6ee88a78522 100644 (file)
--- a/runtime/GetterSetter.cpp
+++ b/runtime/GetterSetter.cpp
@@ -23,24 +23,59 @@
 #include "config.h"
 #include "GetterSetter.h"
 
 #include "config.h"
 #include "GetterSetter.h"
 

+#include "Error.h"

 #include "JSObject.h"
 #include "JSObject.h"

+#include "JSCInlines.h"

 #include <wtf/Assertions.h>
 
 namespace JSC {
 
 #include <wtf/Assertions.h>
 
 namespace JSC {
 

-void GetterSetter::markChildren(MarkStack& markStack)
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(GetterSetter);
+
+const ClassInfo GetterSetter::s_info = { "GetterSetter", 0, 0, 0, CREATE_METHOD_TABLE(GetterSetter) };
+
+void GetterSetter::visitChildren(JSCell* cell, SlotVisitor& visitor)

 {
 {

-    JSCell::markChildren(markStack);
+    GetterSetter* thisObject = jsCast<GetterSetter*>(cell);
+    ASSERT_GC_OBJECT_INHERITS(thisObject, info());
+    ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
+    JSCell::visitChildren(thisObject, visitor);

 
 

-    if (m_getter)
-        markStack.append(m_getter);
-    if (m_setter)
-        markStack.append(m_setter);
+    visitor.append(&thisObject->m_getter);
+    visitor.append(&thisObject->m_setter);

 }
 
 }
 

-bool GetterSetter::isGetterSetter() const
+JSValue callGetter(ExecState* exec, JSValue base, JSValue getterSetter)

 {
 {

-    return true;
+    // FIXME: Some callers may invoke get() without checking for an exception first.
+    // We work around that by checking here.
+    if (exec->hadException())
+        return exec->exception();
+
+    JSObject* getter = jsCast<GetterSetter*>(getterSetter)->getter();
+    if (!getter)
+        return jsUndefined();
+
+    CallData callData;
+    CallType callType = getter->methodTable(exec->vm())->getCallData(getter, callData);
+    return call(exec, getter, callType, callData, base, ArgList());
+}
+
+void callSetter(ExecState* exec, JSValue base, JSValue getterSetter, JSValue value, ECMAMode ecmaMode)
+{
+    JSObject* setter = jsCast<GetterSetter*>(getterSetter)->setter();
+    if (!setter) {
+        if (ecmaMode == StrictMode)
+            throwTypeError(exec, StrictModeReadonlyPropertyWriteError);
+        return;
+    }
+
+    MarkedArgumentBuffer args;
+    args.append(value);
+
+    CallData callData;
+    CallType callType = setter->methodTable(exec->vm())->getCallData(setter, callData);
+    call(exec, setter, callType, callData, base, args);

 }
 
 } // namespace JSC
 }
 
 } // namespace JSC