Title: [233999] trunk/Source/_javascript_Core
- Revision
- 233999
- Author
- [email protected]
- Date
- 2018-07-19 12:43:00 -0700 (Thu, 19 Jul 2018)
Log Message
Unreviewed, rolling out r233998.
https://bugs.webkit.org/show_bug.cgi?id=187815
Not needed. (Requested by mlam|a on #webkit).
Reverted changeset:
"Temporarily mitigate a bug where a source provider is null
when it shouldn't be."
https://bugs.webkit.org/show_bug.cgi?id=187812
https://trac.webkit.org/changeset/233998
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (233998 => 233999)
--- trunk/Source/_javascript_Core/ChangeLog 2018-07-19 19:28:08 UTC (rev 233998)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-07-19 19:43:00 UTC (rev 233999)
@@ -1,3 +1,17 @@
+2018-07-19 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r233998.
+ https://bugs.webkit.org/show_bug.cgi?id=187815
+
+ Not needed. (Requested by mlam|a on #webkit).
+
+ Reverted changeset:
+
+ "Temporarily mitigate a bug where a source provider is null
+ when it shouldn't be."
+ https://bugs.webkit.org/show_bug.cgi?id=187812
+ https://trac.webkit.org/changeset/233998
+
2018-07-19 Mark Lam <[email protected]>
Temporarily mitigate a bug where a source provider is null when it shouldn't be.
Modified: trunk/Source/_javascript_Core/runtime/Error.cpp (233998 => 233999)
--- trunk/Source/_javascript_Core/runtime/Error.cpp 2018-07-19 19:28:08 UTC (rev 233998)
+++ trunk/Source/_javascript_Core/runtime/Error.cpp 2018-07-19 19:43:00 UTC (rev 233999)
@@ -239,6 +239,7 @@
JSObject* addErrorInfo(CallFrame* callFrame, JSObject* error, int line, const SourceCode& source)
{
VM& vm = callFrame->vm();
+ const String& sourceURL = source.provider()->url();
// The putDirect() calls below should really be put() so that they trigger materialization of
// the line/sourceURL properties. Otherwise, what we set here will just be overwritten later.
@@ -255,15 +256,8 @@
// https://bugs.webkit.org/show_bug.cgi?id=176673
if (line != -1)
error->putDirect(vm, vm.propertyNames->line, jsNumber(line));
-
- SourceProvider* provider = source.provider();
- // FIXME: Remove this ASSERT and null check when https://webkit.org/b/187811 is fixed.
- ASSERT(provider);
- if (LIKELY(provider)) {
- const String& sourceURL = provider->url();
- if (!sourceURL.isNull())
- error->putDirect(vm, vm.propertyNames->sourceURL, jsString(&vm, sourceURL));
- }
+ if (!sourceURL.isNull())
+ error->putDirect(vm, vm.propertyNames->sourceURL, jsString(&vm, sourceURL));
return error;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
