Attachment 361470 Details for Bug 194421 – Patch

[patch] Patch

bug-194421-20190207164704.patch (text/plain), 2.59 KB, created by Keith Miller on 2019-02-07 16:47:06 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Miller

Created: 2019-02-07 16:47:06 PST

Size: 2.59 KB

patch

obsolete

>Subversion Revision: 241169
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 1a08fea7c578a822a7e8194a2b6220555548a836..54e43566d613786c27446c8c039d9d40695fa1ff 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-02-07  Keith Miller  <keith_miller@apple.com>
>+
>+        Better error messages for module loader SPI
>+        https://bugs.webkit.org/show_bug.cgi?id=194421
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * API/JSAPIGlobalObject.mm:
>+        (JSC::JSAPIGlobalObject::moduleLoaderImportModule):
>+
> 2019-02-07  Mark Lam  <mark.lam@apple.com>
> 
>         Fix more doesGC() for CheckTraps, GetMapBucket, and Switch nodes.
>diff --git a/Source/JavaScriptCore/API/JSAPIGlobalObject.mm b/Source/JavaScriptCore/API/JSAPIGlobalObject.mm
>index d5c2365d0847148c80f8992bc044352f31bcbf0e..1fe872f8a6e54587fe488db45bd658438da96223 100644
>--- a/Source/JavaScriptCore/API/JSAPIGlobalObject.mm
>+++ b/Source/JavaScriptCore/API/JSAPIGlobalObject.mm
>@@ -116,7 +116,7 @@ JSInternalPromise* JSAPIGlobalObject::moduleLoaderImportModule(JSGlobalObject* g
>         return import(absoluteURL);
> 
>     if (!specifier.startsWith('/') && !specifier.startsWith("./") && !specifier.startsWith("../"))
>-        return reject(createError(exec, "Module specifier does not start with \"/\", \"./\", or \"../\"."_s));
>+        return reject(createError(exec, makeString("Module specifier: ", specifier, " does not start with \"/\", \"./\", or \"../\"."_s)));
> 
>     if (specifier.startsWith('/')) {
>         absoluteURL = URL(URL({ }, "file://"), specifier);
>@@ -126,16 +126,16 @@ JSInternalPromise* JSAPIGlobalObject::moduleLoaderImportModule(JSGlobalObject* g
> 
>     auto noBaseErrorMessage = "Could not determine the base URL for loading."_s;
>     if (sourceOrigin.isNull())
>-        return reject(createError(exec, noBaseErrorMessage));
>+        return reject(createError(exec, makeString(noBaseErrorMessage, " Referring script has no URL."_s)));
> 
>     auto referrer = sourceOrigin.string();
>     URL baseURL(URL(), referrer);
>     if (!baseURL.isValid())
>-        return reject(createError(exec, noBaseErrorMessage));
>+        return reject(createError(exec, makeString(noBaseErrorMessage, " Referring script's URL is not valid: "_s, baseURL.string())));
> 
>     URL url(baseURL, specifier);
>     if (!url.isValid())
>-        return reject(createError(exec, "could not determine a valid URL for module specifier"_s));
>+        return reject(createError(exec, makeString("could not determine a valid URL for module specifier. Tried: "_s, url.string())));
> 
>     return import(url);
> }

Flags:

saam: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 194421: 361470