Changeset 39255 in webkit for trunk/JavaScriptCore/bytecode/CodeBlock.h

Timestamp:

Dec 12, 2008, 2:48:53 PM (16 years ago)

Author:

[email protected]

Message:

2008-12-12 Cameron Zwarich <​[email protected]>

Reviewed by Sam Weinig.

Bug 22828: Do not inspect bytecode instruction stream for op_get_by_id exception information
<​https://bugs.webkit.org/show_bug.cgi?id=22828>

In order to remove the bytecode instruction stream after generating
native code, all inspection of bytecode instructions at runtime must
be removed. One particular instance of this is the special handling of
exceptions thrown by the op_get_by_id emitted directly before an
op_construct or an op_instanceof. This patch moves that information to
an auxiliary data structure in CodeBlock.

• bytecode/CodeBlock.cpp: (JSC::CodeBlock::getByIdExceptionInfoForBytecodeOffset):
• bytecode/CodeBlock.h: (JSC::CodeBlock::addGetByIdExceptionInfo):
• bytecompiler/BytecodeGenerator.cpp: (JSC::BytecodeGenerator::emitConstruct):
• bytecompiler/BytecodeGenerator.h: (JSC::BytecodeGenerator::emitGetByIdExceptionInfo):
• parser/Nodes.cpp: (JSC::InstanceOfNode::emitBytecode):
• runtime/ExceptionHelpers.cpp: (JSC::createNotAnObjectError):

File:

• trunk/JavaScriptCore/bytecode/CodeBlock.h (modified) (4 diffs)

trunk/JavaScriptCore/bytecode/CodeBlock.h

@@ -79 +79 @@
     };
 
+    // Both op_construct 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.
+    struct GetByIdExceptionInfo {
+        unsigned bytecodeOffset : 31;
+        bool isOpConstruct : 1;
+    };
+
 #if ENABLE(JIT)
     struct CallLinkInfo {
@@ -228 +236 @@
         int lineNumberForBytecodeOffset(unsigned bytecodeOffset);
         int expressionRangeForBytecodeOffset(unsigned bytecodeOffset, int& divot, int& startOffset, int& endOffset);
+        bool getByIdExceptionInfoForBytecodeOffset(unsigned bytecodeOffset, OpcodeID&);
 
 #if ENABLE(JIT)
@@ -303 +312 @@
 
         void addExpressionInfo(const ExpressionRangeInfo& expressionInfo) { return m_expressionInfo.append(expressionInfo); }
+        void addGetByIdExceptionInfo(const GetByIdExceptionInfo& info) { m_getByIdExceptionInfo.append(info); }
 
         size_t numberOfLineInfos() const { return m_lineInfo.size(); }
@@ -427 +437 @@
         Vector<ExpressionRangeInfo> m_expressionInfo;
         Vector<LineInfo> m_lineInfo;
+        Vector<GetByIdExceptionInfo> m_getByIdExceptionInfo;
 
 #if ENABLE(JIT)