Title: [117193] trunk/Source/_javascript_Core
- Revision
- 117193
- Author
- [email protected]
- Date
- 2012-05-15 17:21:00 -0700 (Tue, 15 May 2012)
Log Message
Make error information available even if all we have is line number information.
https://bugs.webkit.org/show_bug.cgi?id=86547
Reviewed by Filip Pizlo.
We don't need _expression_ information to generate useful line, file, and stack information,
so only require that we have line number info available.
* interpreter/Interpreter.cpp:
(JSC::Interpreter::throwException):
* runtime/Executable.h:
(JSC):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (117192 => 117193)
--- trunk/Source/_javascript_Core/ChangeLog 2012-05-16 00:01:32 UTC (rev 117192)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-05-16 00:21:00 UTC (rev 117193)
@@ -1,3 +1,18 @@
+2012-05-15 Oliver Hunt <[email protected]>
+
+ Make error information available even if all we have is line number information.
+ https://bugs.webkit.org/show_bug.cgi?id=86547
+
+ Reviewed by Filip Pizlo.
+
+ We don't need _expression_ information to generate useful line, file, and stack information,
+ so only require that we have line number info available.
+
+ * interpreter/Interpreter.cpp:
+ (JSC::Interpreter::throwException):
+ * runtime/Executable.h:
+ (JSC):
+
2012-05-15 Mark Hahnenberg <[email protected]>
Block freeing thread should not free blocks when we are actively requesting them
Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.cpp (117192 => 117193)
--- trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2012-05-16 00:01:32 UTC (rev 117192)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2012-05-16 00:21:00 UTC (rev 117193)
@@ -1023,9 +1023,7 @@
if (exception->isErrorInstance() && static_cast<ErrorInstance*>(exception)->appendSourceToMessage())
appendSourceToError(callFrame, static_cast<ErrorInstance*>(exception), bytecodeOffset);
- // Using hasExpressionInfo to imply we are interested in rich exception info.
- if (codeBlock->hasExpressionInfo() && !hasErrorInfo(callFrame, exception)) {
- ASSERT(codeBlock->hasLineInfo());
+ if (codeBlock->hasLineInfo() && !hasErrorInfo(callFrame, exception)) {
// FIXME: should only really be adding these properties to VM generated exceptions,
// but the inspector currently requires these for all thrown objects.
addErrorInfo(callFrame, exception, codeBlock->lineNumberForBytecodeOffset(bytecodeOffset), codeBlock->ownerExecutable()->source());
Modified: trunk/Source/_javascript_Core/runtime/Executable.h (117192 => 117193)
--- trunk/Source/_javascript_Core/runtime/Executable.h 2012-05-16 00:01:32 UTC (rev 117192)
+++ trunk/Source/_javascript_Core/runtime/Executable.h 2012-05-16 00:21:00 UTC (rev 117193)
@@ -43,8 +43,6 @@
class LLIntOffsetsExtractor;
class ProgramCodeBlock;
class ScopeChainNode;
-
- struct ExceptionInfo;
enum CompilationKind { FirstCompilation, OptimizingCompilation };
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
