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

Timestamp:

Dec 12, 2008, 1:31:33 PM (16 years ago)

Author:

[email protected]

Message:

2008-12-12 Sam Weinig <​[email protected]>

Reviewed by Geoffrey Garen.

Change exception information accessors to take offsets into the bytecode
instruction buffer instead of pointers so that they can work even even
if the bytecode buffer is purged.

• bytecode/CodeBlock.cpp: (JSC::instructionOffsetForNth): (JSC::CodeBlock::handlerForBytecodeOffset): (JSC::CodeBlock::lineNumberForBytecodeOffset): (JSC::CodeBlock::expressionRangeForBytecodeOffset):
• bytecode/CodeBlock.h:
• bytecode/SamplingTool.cpp: (JSC::SamplingTool::dump):
• interpreter/Interpreter.cpp: (JSC::Interpreter::throwException): (JSC::Interpreter::privateExecute): (JSC::Interpreter::retrieveLastCaller):
• jit/JIT.cpp: (JSC::JIT::privateCompileMainPass):
• runtime/ExceptionHelpers.cpp: (JSC::createUndefinedVariableError): (JSC::createInvalidParamError): (JSC::createNotAConstructorError): (JSC::createNotAFunctionError): (JSC::createNotAnObjectError):

File:

• trunk/JavaScriptCore/runtime/ExceptionHelpers.cpp (modified) (5 diffs)

trunk/JavaScriptCore/runtime/ExceptionHelpers.cpp

@@ -93 +93 @@
     int endOffset = 0;
     int divotPoint = 0;
-    int line = codeBlock->expressionRangeForVPC(vPC, divotPoint, startOffset, endOffset);
+    int line = codeBlock->expressionRangeForBytecodeOffset(vPC - codeBlock->instructions().begin(), divotPoint, startOffset, endOffset);
     UString message = "Can't find variable: ";
     message.append(ident.ustring());
@@ -158 +158 @@
     int endOffset = 0;
     int divotPoint = 0;
-    int line = codeBlock->expressionRangeForVPC(vPC, divotPoint, startOffset, endOffset);
+    int line = codeBlock->expressionRangeForBytecodeOffset(vPC - codeBlock->instructions().begin(), divotPoint, startOffset, endOffset);
     UString errorMessage = createErrorMessage(exec, codeBlock, line, divotPoint, divotPoint + endOffset, value, message);
     JSObject* exception = Error::create(exec, TypeError, errorMessage, line, codeBlock->ownerNode()->sourceID(), codeBlock->ownerNode()->sourceURL());
@@ -172 +172 @@
     int endOffset = 0;
     int divotPoint = 0;
-    int line = codeBlock->expressionRangeForVPC(vPC, divotPoint, startOffset, endOffset);
+    int line = codeBlock->expressionRangeForBytecodeOffset(vPC - codeBlock->instructions().begin(), divotPoint, startOffset, endOffset);
 
     // We're in a "new" expression, so we need to skip over the "new.." part
@@ -193 +193 @@
     int endOffset = 0;
     int divotPoint = 0;
-    int line = codeBlock->expressionRangeForVPC(vPC, divotPoint, startOffset, endOffset);
+    int line = codeBlock->expressionRangeForBytecodeOffset(vPC - codeBlock->instructions().begin(), divotPoint, startOffset, endOffset);
     UString errorMessage = createErrorMessage(exec, codeBlock, line, divotPoint - startOffset, divotPoint, value, "not a function");
     JSObject* exception = Error::create(exec, TypeError, errorMessage, line, codeBlock->ownerNode()->sourceID(), codeBlock->ownerNode()->sourceURL());    
@@ -217 +217 @@
     int endOffset = 0;
     int divotPoint = 0;
-    int line = codeBlock->expressionRangeForVPC(vPC, divotPoint, startOffset, endOffset);
+    int line = codeBlock->expressionRangeForBytecodeOffset(vPC - codeBlock->instructions().begin(), divotPoint, startOffset, endOffset);
     UString errorMessage = createErrorMessage(exec, codeBlock, line, divotPoint - startOffset, divotPoint, error->isNull() ? jsNull() : jsUndefined(), "not an object");
     JSObject* exception = Error::create(exec, TypeError, errorMessage, line, codeBlock->ownerNode()->sourceID(), codeBlock->ownerNode()->sourceURL());