JavaScriptCore-7601.1.46.3.tar.gz

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

diff --git a/runtime/JSBoundFunction.cpp b/runtime/JSBoundFunction.cpp
index 5fee47c24813a57b878a390a8460734af3344fae..8c5cc2ed390482eac2e775a4f0c2d2d5c4c99e61 100644 (file)
--- a/runtime/JSBoundFunction.cpp
+++ b/runtime/JSBoundFunction.cpp
@@ -28,13 +28,11 @@
 
 #include "GetterSetter.h"
 #include "JSGlobalObject.h"
 
 #include "GetterSetter.h"
 #include "JSGlobalObject.h"

+#include "JSCInlines.h"

 
 namespace JSC {
 
 
 namespace JSC {
 

-ASSERT_CLASS_FITS_IN_CELL(JSBoundFunction);
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSBoundFunction);
-
-const ClassInfo JSBoundFunction::s_info = { "Function", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(JSBoundFunction) };
+const ClassInfo JSBoundFunction::s_info = { "Function", &Base::s_info, 0, CREATE_METHOD_TABLE(JSBoundFunction) };

 
 EncodedJSValue JSC_HOST_CALL boundFunctionCall(ExecState* exec)
 {
 
 EncodedJSValue JSC_HOST_CALL boundFunctionCall(ExecState* exec)
 {


@@ -45,9 +43,9 @@ EncodedJSValue JSC_HOST_CALL boundFunctionCall(ExecState* exec)
 
     MarkedArgumentBuffer args;
     for (unsigned i = 0; i < boundArgs->length(); ++i)
 
     MarkedArgumentBuffer args;
     for (unsigned i = 0; i < boundArgs->length(); ++i)

-        args.append(boundArgs->getIndex(i));
+        args.append(boundArgs->getIndexQuickly(i));

     for (unsigned i = 0; i < exec->argumentCount(); ++i)
     for (unsigned i = 0; i < exec->argumentCount(); ++i)

-        args.append(exec->argument(i));
+        args.append(exec->uncheckedArgument(i));

 
     JSObject* targetFunction = boundFunction->targetFunction();
     CallData callData;
 
     JSObject* targetFunction = boundFunction->targetFunction();
     CallData callData;


@@ -65,9 +63,9 @@ EncodedJSValue JSC_HOST_CALL boundFunctionConstruct(ExecState* exec)
 
     MarkedArgumentBuffer args;
     for (unsigned i = 0; i < boundArgs->length(); ++i)
 
     MarkedArgumentBuffer args;
     for (unsigned i = 0; i < boundArgs->length(); ++i)

-        args.append(boundArgs->getIndex(i));
+        args.append(boundArgs->getIndexQuickly(i));

     for (unsigned i = 0; i < exec->argumentCount(); ++i)
     for (unsigned i = 0; i < exec->argumentCount(); ++i)

-        args.append(exec->argument(i));
+        args.append(exec->uncheckedArgument(i));

 
     JSObject* targetFunction = boundFunction->targetFunction();
     ConstructData constructData;
 
     JSObject* targetFunction = boundFunction->targetFunction();
     ConstructData constructData;


@@ -76,52 +74,44 @@ EncodedJSValue JSC_HOST_CALL boundFunctionConstruct(ExecState* exec)
     return JSValue::encode(construct(exec, targetFunction, constructType, constructData, args));
 }
 
     return JSValue::encode(construct(exec, targetFunction, constructType, constructData, args));
 }
 

-JSBoundFunction* JSBoundFunction::create(ExecState* exec, JSGlobalObject* globalObject, JSObject* targetFunction, JSValue boundThis, JSValue boundArgs, int length, const Identifier& name)
+JSBoundFunction* JSBoundFunction::create(VM& vm, JSGlobalObject* globalObject, JSObject* targetFunction, JSValue boundThis, JSValue boundArgs, int length, const String& name)

 {
     ConstructData constructData;
     ConstructType constructType = JSC::getConstructData(targetFunction, constructData);
     bool canConstruct = constructType != ConstructTypeNone;
 {
     ConstructData constructData;
     ConstructType constructType = JSC::getConstructData(targetFunction, constructData);
     bool canConstruct = constructType != ConstructTypeNone;

+    NativeExecutable* executable = vm.getHostFunction(boundFunctionCall, canConstruct ? boundFunctionConstruct : callHostFunctionAsConstructor);
+    JSBoundFunction* function = new (NotNull, allocateCell<JSBoundFunction>(vm.heap)) JSBoundFunction(vm, globalObject, globalObject->boundFunctionStructure(), targetFunction, boundThis, boundArgs);

 
 

-    NativeExecutable* executable = exec->globalData().getHostFunction(boundFunctionCall, canConstruct ? boundFunctionConstruct : callHostFunctionAsConstructor);
-    JSBoundFunction* function = new (NotNull, allocateCell<JSBoundFunction>(*exec->heap())) JSBoundFunction(exec, globalObject, globalObject->boundFunctionStructure(), targetFunction, boundThis, boundArgs);
-
-    function->finishCreation(exec, executable, length, name);
+    function->finishCreation(vm, executable, length, name);

     return function;
 }
 
     return function;
 }
 

-bool JSBoundFunction::hasInstance(JSObject* object, ExecState* exec, JSValue value, JSValue)
+bool JSBoundFunction::customHasInstance(JSObject* object, ExecState* exec, JSValue value)

 {
 {

-    JSBoundFunction* thisObject = jsCast<JSBoundFunction*>(object);
-    // FIXME: our instanceof implementation will have already (incorrectly) performed
-    // a [[Get]] of .prototype from the bound function object, which is incorrect!
-    // https://bugs.webkit.org/show_bug.cgi?id=68656
-    JSValue proto = thisObject->m_targetFunction->get(exec, exec->propertyNames().prototype);
-    return thisObject->m_targetFunction->methodTable()->hasInstance(thisObject->m_targetFunction.get(), exec, value, proto);
+    return jsCast<JSBoundFunction*>(object)->m_targetFunction->hasInstance(exec, value);

 }
 
 }
 

-JSBoundFunction::JSBoundFunction(ExecState* exec, JSGlobalObject* globalObject, Structure* structure, JSObject* targetFunction, JSValue boundThis, JSValue boundArgs)
-    : Base(exec, globalObject, structure)
-    , m_targetFunction(exec->globalData(), this, targetFunction)
-    , m_boundThis(exec->globalData(), this, boundThis)
-    , m_boundArgs(exec->globalData(), this, boundArgs)
+JSBoundFunction::JSBoundFunction(VM& vm, JSGlobalObject* globalObject, Structure* structure, JSObject* targetFunction, JSValue boundThis, JSValue boundArgs)
+    : Base(vm, globalObject, structure)
+    , m_targetFunction(vm, this, targetFunction)
+    , m_boundThis(vm, this, boundThis)
+    , m_boundArgs(vm, this, boundArgs)

 {
 }
 
 {
 }
 

-void JSBoundFunction::finishCreation(ExecState* exec, NativeExecutable* executable, int length, const Identifier& name)
+void JSBoundFunction::finishCreation(VM& vm, NativeExecutable* executable, int length, const String& name)

 {
 {

-    Base::finishCreation(exec, executable, length, name);
-    ASSERT(inherits(&s_info));
+    Base::finishCreation(vm, executable, length, name);
+    ASSERT(inherits(info()));

 
 

-    putDirectAccessor(exec->globalData(), exec->propertyNames().arguments, globalObject()->throwTypeErrorGetterSetter(exec), DontDelete | DontEnum | Accessor);
-    putDirectAccessor(exec->globalData(), exec->propertyNames().caller, globalObject()->throwTypeErrorGetterSetter(exec), DontDelete | DontEnum | Accessor);
+    putDirectNonIndexAccessor(vm, vm.propertyNames->arguments, globalObject()->throwTypeErrorGetterSetter(vm), DontDelete | DontEnum | Accessor);
+    putDirectNonIndexAccessor(vm, vm.propertyNames->caller, globalObject()->throwTypeErrorGetterSetter(vm), DontDelete | DontEnum | Accessor);

 }
 
 void JSBoundFunction::visitChildren(JSCell* cell, SlotVisitor& visitor)
 {
     JSBoundFunction* thisObject = jsCast<JSBoundFunction*>(cell);
 }
 
 void JSBoundFunction::visitChildren(JSCell* cell, SlotVisitor& visitor)
 {
     JSBoundFunction* thisObject = jsCast<JSBoundFunction*>(cell);

-    ASSERT_GC_OBJECT_INHERITS(thisObject, &s_info);
-    COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
-    ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
+    ASSERT_GC_OBJECT_INHERITS(thisObject, info());

     Base::visitChildren(thisObject, visitor);
 
     visitor.append(&thisObject->m_targetFunction);
     Base::visitChildren(thisObject, visitor);
 
     visitor.append(&thisObject->m_targetFunction);