Changeset 60117 in webkit for trunk/JavaScriptCore/runtime/ExceptionHelpers.cpp

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:

File:

• trunk/JavaScriptCore/runtime/ExceptionHelpers.cpp (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);