Changeset 60117 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

May 24, 2010, 8:04:43 PM (15 years ago)

Author:

[email protected]

Message:

Relanding r60075.

Reviewed by Sam Weinig.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::dump):
(JSC::CodeBlock::getByIdExceptionInfoForBytecodeOffset):

• bytecode/CodeBlock.h:
• bytecode/Opcode.h:
• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::BytecodeGenerator):
(JSC::BytecodeGenerator::emitConstruct):

• bytecompiler/BytecodeGenerator.h:

(JSC::BytecodeGenerator::emitGetByIdExceptionInfo):

• interpreter/Interpreter.cpp:

(JSC::Interpreter::privateExecute):

• jit/JIT.cpp:

(JSC::JIT::privateCompileMainPass):

• jit/JIT.h:
• jit/JITCall.cpp:

(JSC::JIT::compileOpCall):
(JSC::JIT::compileOpCallSlowCase):

• jit/JITCall32_64.cpp:

(JSC::JIT::compileOpCall):
(JSC::JIT::compileOpCallSlowCase):

• jit/JITOpcodes.cpp:

(JSC::JIT::privateCompileCTIMachineTrampolines):
(JSC::JIT::privateCompileCTINativeCall):
(JSC::JIT::emit_op_neq_null):
(JSC::JIT::emit_op_convert_this):
(JSC::JIT::emit_op_get_callee):
(JSC::JIT::emit_op_create_this):

• jit/JITOpcodes32_64.cpp:

(JSC::JIT::privateCompileCTIMachineTrampolines):
(JSC::JIT::privateCompileCTINativeCall):
(JSC::JIT::emit_op_get_callee):
(JSC::JIT::emit_op_create_this):

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):
(JSC::JITThunks::hostFunctionStub):

• jit/JITStubs.h:

(JSC::JITThunks::ctiNativeConstruct):
(JSC::):

• runtime/ExceptionHelpers.cpp:

(JSC::createNotAnObjectError):

• runtime/Executable.h:

(JSC::NativeExecutable::create):
(JSC::NativeExecutable::NativeExecutable):

• runtime/JSFunction.cpp:

(JSC::callHostFunctionAsConstructor):

• runtime/JSFunction.h:
• wtf/Platform.h:

Location:

trunk/JavaScriptCore/runtime

Files:

• ExceptionHelpers.cpp (modified) (1 diff)
• Executable.h (modified) (2 diffs)
• JSFunction.cpp (modified) (2 diffs)
• JSFunction.h (modified) (1 diff)

trunk/JavaScriptCore/runtime/ExceptionHelpers.cpp

@@ -183 +183 @@
 JSObject* createNotAnObjectError(ExecState* exec, JSNotAnObjectErrorStub* error, unsigned bytecodeOffset, CodeBlock* codeBlock)
 {
-    // Both op_construct and op_instanceof require a use of op_get_by_id to get
+    // Both op_create_this and op_instanceof require a use of op_get_by_id to get
     // the prototype property from an object. The exception messages for exceptions
     // thrown by these instances op_get_by_id need to reflect this.
     OpcodeID followingOpcodeID;
     if (codeBlock->getByIdExceptionInfoForBytecodeOffset(exec, bytecodeOffset, followingOpcodeID)) {
-        ASSERT(followingOpcodeID == op_construct || followingOpcodeID == op_instanceof);
-        if (followingOpcodeID == op_construct)
+        ASSERT(followingOpcodeID == op_create_this || followingOpcodeID == op_instanceof);
+        if (followingOpcodeID == op_create_this)
             return createNotAConstructorError(exec, error->isNull() ? jsNull() : jsUndefined(), bytecodeOffset, codeBlock);
         return createInvalidParamError(exec, "instanceof", error->isNull() ? jsNull() : jsUndefined(), bytecodeOffset, codeBlock);

trunk/JavaScriptCore/runtime/Executable.h

@@ -94 +94 @@
         friend class JIT;
     public:
-        static PassRefPtr<NativeExecutable> create(MacroAssemblerCodePtr thunk, NativeFunction function)
-        {
-            return adoptRef(new NativeExecutable(JITCode::HostFunction(thunk), function));
+        static PassRefPtr<NativeExecutable> create(MacroAssemblerCodePtr callThunk, NativeFunction function, MacroAssemblerCodePtr constructThunk, NativeFunction constructor)
+        {
+            return adoptRef(new NativeExecutable(JITCode::HostFunction(callThunk), function, JITCode::HostFunction(constructThunk), constructor));
         }
 
@@ -104 +104 @@
 
     private:
-        NativeExecutable(JITCode thunk, NativeFunction function)
+        NativeExecutable(JITCode callThunk, NativeFunction function, JITCode constructThunk, NativeFunction constructor)
             : ExecutableBase(NUM_PARAMETERS_IS_HOST)
             , m_function(function)
-        {
-            m_jitCodeForCall = thunk;
-            m_jitCodeForConstruct = thunk;
+            , m_constructor(constructor)
+        {
+            m_jitCodeForCall = callThunk;
+            m_jitCodeForConstruct = constructThunk;
         }
 
         NativeFunction m_function;
+        // Probably should be a NativeConstructor, but this will currently require rewriting the JIT
+        // trampoline. It may be easier to make NativeFunction be passed 'this' as a part of the ArgList.
+        NativeFunction m_constructor;
     };
 #endif

trunk/JavaScriptCore/runtime/JSFunction.cpp

@@ -29 +29 @@
 #include "CommonIdentifiers.h"
 #include "CallFrame.h"
+#include "ExceptionHelpers.h"
 #include "FunctionPrototype.h"
 #include "JSGlobalObject.h"
@@ -41 +42 @@
 
 namespace JSC {
+
+JSValue JSC_HOST_CALL callHostFunctionAsConstructor(ExecState* exec, JSObject* constructor, JSValue, const ArgList&)
+{
+    CodeBlock* codeBlock = exec->callerFrame()->codeBlock();
+    unsigned vPCIndex = codeBlock->bytecodeOffset(exec, exec->returnPC());
+    exec->setException(createNotAConstructorError(exec, constructor, vPCIndex, codeBlock));
+    return JSValue();
+}
 
 ASSERT_CLASS_FITS_IN_CELL(JSFunction);

trunk/JavaScriptCore/runtime/JSFunction.h

@@ -35 +35 @@
     class JSGlobalObject;
     class NativeExecutable;
+
+    JSValue JSC_HOST_CALL callHostFunctionAsConstructor(ExecState*, JSObject*, JSValue, const ArgList&);
 
     class JSFunction : public JSObjectWithGlobalObject {