Changeset 35245 in webkit for trunk/JavaScriptCore/VM/CodeBlock.h

Timestamp:

Jul 18, 2008, 6:44:24 PM (17 years ago)

Author:

[email protected]

Message:

Bug 18774: SQUIRRELFISH: print meaningful error messages <​https://bugs.webkit.org/show_bug.cgi?id=18774>
<rdar://problem/5769353> SQUIRRELFISH: JavaScript error messages are missing informative text

Reviewed by Cameron Zwarich

Add support for decent error messages in JavaScript. This patch achieves this by providing
ensuring the common errors and exceptions have messages that provide the text of expression
that trigger the exception. In addition it attaches a number of properties to the exception
object detailing where in the source the expression came from.

File:

• trunk/JavaScriptCore/VM/CodeBlock.h (modified) (7 diffs)

trunk/JavaScriptCore/VM/CodeBlock.h

@@ -34 +34 @@
 #include "JSGlobalObject.h"
 #include "nodes.h"
+#include "SourceRange.h"
 #include "ustring.h"
 #include <wtf/RefPtr.h>
@@ -45 +46 @@
 
     struct HandlerInfo {
-        unsigned start;
-        unsigned end;
-        unsigned target;
-        unsigned scopeDepth;
+        uint32_t start;
+        uint32_t end;
+        uint32_t target;
+        uint32_t scopeDepth;
+    };
+
+    struct ExpressionRangeInfo {
+        enum { MaxOffset = (1 << 7) - 1, 
+               MaxDivot = (1 << 25) - 1
+        };
+        uint32_t instructionOffset : 25;
+        uint32_t divotPoint : 25;
+        uint32_t startOffset : 7;
+        uint32_t endOffset : 7;
     };
 
     struct LineInfo {
-        unsigned instructionOffset;
-        int lineNumber;
+        uint32_t instructionOffset;
+        int32_t lineNumber;
     };
 
     struct CodeBlock {
-        CodeBlock(ScopeNode* ownerNode_, CodeType codeType_)
+        CodeBlock(ScopeNode* ownerNode_, CodeType codeType_, PassRefPtr<SourceProvider> source_, unsigned sourceOffset_)
             : ownerNode(ownerNode_)
             , numTemporaries(0)
@@ -66 +77 @@
             , usesEval(ownerNode_->usesEval())
             , codeType(codeType_)
+            , source(source_)
+            , sourceOffset(sourceOffset_)
         {
         }
 
         void dump(ExecState*) const;
-        int lineNumberForVPC(const Instruction*);
+        int expressionRangeForVPC(const Instruction*, int& divot, int& startOffset, int& endOffset);
+        int lineNumberForVPC(const Instruction* vPC);
         bool getHandlerForVPC(const Instruction* vPC, Instruction*& target, int& scopeDepth);
         void mark();
@@ -84 +98 @@
         bool usesEval;
         CodeType codeType;
+        RefPtr<SourceProvider> source;
+        unsigned sourceOffset;
 
         Vector<Instruction> instructions;
@@ -94 +110 @@
         Vector<RefPtr<RegExp> > regexps;
         Vector<HandlerInfo> exceptionHandlers;
+        Vector<ExpressionRangeInfo> expressionInfo;
         Vector<LineInfo> lineInfo;
 
@@ -104 +121 @@
 
     struct ProgramCodeBlock : public CodeBlock {
-        ProgramCodeBlock(ScopeNode* ownerNode_, CodeType codeType_, JSGlobalObject* globalObject_)
-            : CodeBlock(ownerNode_, codeType_)
+        ProgramCodeBlock(ScopeNode* ownerNode_, CodeType codeType_, JSGlobalObject* globalObject_, PassRefPtr<SourceProvider> source_)
+            : CodeBlock(ownerNode_, codeType_, source_, 0)
             , globalObject(globalObject_)
         {
@@ -121 +138 @@
 
     struct EvalCodeBlock : public ProgramCodeBlock {
-        EvalCodeBlock(ScopeNode* ownerNode_, JSGlobalObject* globalObject_)
-            : ProgramCodeBlock(ownerNode_, EvalCode, globalObject_)
+        EvalCodeBlock(ScopeNode* ownerNode_, JSGlobalObject* globalObject_, PassRefPtr<SourceProvider> source_)
+            : ProgramCodeBlock(ownerNode_, EvalCode, globalObject_, source_)
         {
         }