Changeset 233999 in webkit

Timestamp:

Jul 19, 2018 12:43:00 PM (6 years ago)

Author:

commit-queue@webkit.org

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

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/Error.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-07-19  Commit Queue  <commit-queue@webkit.org>
+
+        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  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/runtime/Error.cpp

@@ -240 +240 @@
 {
     VM& vm = callFrame->vm();
+    const String& sourceURL = source.provider()->url();
     
     // The putDirect() calls below should really be put() so that they trigger materialization of
@@ -256 +257 @@
     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;
 }