Title: [160079] releases/WebKitGTK/webkit-2.2/Source/_javascript_Core
- Revision
- 160079
- Author
- [email protected]
- Date
- 2013-12-04 01:30:03 -0800 (Wed, 04 Dec 2013)
Log Message
Merge r154892 - Cleaning errorDescriptionForValue after r154839
https://bugs.webkit.org/show_bug.cgi?id=120531
Patch by Chris Curtis <[email protected]> on 2013-08-30
Reviewed by Darin Adler.
Changed the assert to ASSERT_NOT_REACHED, now that r154839 has landed. errorDescriptionForValue
can assert again that the parameterized JSValue is !isEmpty().
* runtime/ExceptionHelpers.cpp:
(JSC::errorDescriptionForValue):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.2/Source/_javascript_Core/ChangeLog (160078 => 160079)
--- releases/WebKitGTK/webkit-2.2/Source/_javascript_Core/ChangeLog 2013-12-04 09:27:20 UTC (rev 160078)
+++ releases/WebKitGTK/webkit-2.2/Source/_javascript_Core/ChangeLog 2013-12-04 09:30:03 UTC (rev 160079)
@@ -1,3 +1,16 @@
+2013-08-30 Chris Curtis <[email protected]>
+
+ Cleaning errorDescriptionForValue after r154839
+ https://bugs.webkit.org/show_bug.cgi?id=120531
+
+ Reviewed by Darin Adler.
+
+ Changed the assert to ASSERT_NOT_REACHED, now that r154839 has landed. errorDescriptionForValue
+ can assert again that the parameterized JSValue is !isEmpty().
+
+ * runtime/ExceptionHelpers.cpp:
+ (JSC::errorDescriptionForValue):
+
2013-08-29 Julien Brianceau <[email protected]>
REGRESSION(r153222, 32-bit): NULL JSValue() seen when running peacekeeper benchmark.
Modified: releases/WebKitGTK/webkit-2.2/Source/_javascript_Core/runtime/ExceptionHelpers.cpp (160078 => 160079)
--- releases/WebKitGTK/webkit-2.2/Source/_javascript_Core/runtime/ExceptionHelpers.cpp 2013-12-04 09:27:20 UTC (rev 160078)
+++ releases/WebKitGTK/webkit-2.2/Source/_javascript_Core/runtime/ExceptionHelpers.cpp 2013-12-04 09:30:03 UTC (rev 160079)
@@ -109,8 +109,8 @@
return jsString(exec, object->methodTable()->className(object));
}
- ASSERT(v.isEmpty());
- // FIXME: https://bugs.webkit.org/show_bug.cgi?id=120080 The JSValue should never be empty in this function.
+ // The JSValue should never be empty, so this point in the code should never be reached.
+ ASSERT_NOT_REACHED();
return vm.smallStrings.emptyString();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
