Title: [119609] branches/safari-536-branch/Source/_javascript_Core
Diff
Modified: branches/safari-536-branch/Source/_javascript_Core/ChangeLog (119608 => 119609)
--- branches/safari-536-branch/Source/_javascript_Core/ChangeLog 2012-06-06 20:56:07 UTC (rev 119608)
+++ branches/safari-536-branch/Source/_javascript_Core/ChangeLog 2012-06-06 20:56:14 UTC (rev 119609)
@@ -1,5 +1,23 @@
2012-06-06 Mark Rowe <[email protected]>
+ Merge r118995.
+
+ 2012-05-30 Oliver Hunt <[email protected]>
+
+ Really provide error information with the inspector disabled
+ https://bugs.webkit.org/show_bug.cgi?id=87910
+
+ Reviewed by Filip Pizlo.
+
+ Don't bother checking for anything other than pre-existing error info.
+ In the absence of complete line number information you'll only get the
+ line a function starts on, but at least it's something.
+
+ * interpreter/Interpreter.cpp:
+ (JSC::Interpreter::throwException):
+
+2012-06-06 Mark Rowe <[email protected]>
+
Merge r118992.
2012-05-30 Filip Pizlo <[email protected]>
Modified: branches/safari-536-branch/Source/_javascript_Core/interpreter/Interpreter.cpp (119608 => 119609)
--- branches/safari-536-branch/Source/_javascript_Core/interpreter/Interpreter.cpp 2012-06-06 20:56:07 UTC (rev 119608)
+++ branches/safari-536-branch/Source/_javascript_Core/interpreter/Interpreter.cpp 2012-06-06 20:56:14 UTC (rev 119609)
@@ -1023,7 +1023,7 @@
if (exception->isErrorInstance() && static_cast<ErrorInstance*>(exception)->appendSourceToMessage())
appendSourceToError(callFrame, static_cast<ErrorInstance*>(exception), bytecodeOffset);
- if (codeBlock->hasLineInfo() && !hasErrorInfo(callFrame, exception)) {
+ if (!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());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
