Changeset 279178 in webkit

Timestamp:

Jun 23, 2021 12:11:59 PM (3 years ago)

Author:

mark.lam@apple.com

Message:

Remove unneeded explicit exception checks in ScriptModuleLoader::evaluate().
​https://bugs.webkit.org/show_bug.cgi?id=227302

Reviewed by Yusuke Suzuki.

A RELEASE_AND_RETURN will do because we're just propagating the exception to the
client in both cases.

• bindings/js/ScriptModuleLoader.cpp:

(WebCore::ScriptModuleLoader::evaluate):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/ScriptModuleLoader.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-23  Mark Lam  <mark.lam@apple.com>
+
+        Remove unneeded explicit exception checks in ScriptModuleLoader::evaluate().
+        https://bugs.webkit.org/show_bug.cgi?id=227302
+
+        Reviewed by Yusuke Suzuki.
+
+        A RELEASE_AND_RETURN will do because we're just propagating the exception to the
+        client in both cases.
+
+        * bindings/js/ScriptModuleLoader.cpp:
+        (WebCore::ScriptModuleLoader::evaluate):
+
 2021-06-23  Kimmo Kinnunen  <kkinnunen@apple.com>
 

trunk/Source/WebCore/bindings/js/ScriptModuleLoader.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2015-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2021 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -245 +245 @@
 
     if (m_ownerType == OwnerType::Document) {
-        if (auto* frame = downcast<Document>(m_context).frame()) {
-            auto jsValue = frame->script().evaluateModule(sourceURL, *moduleRecord, awaitedValue, resumeMode);
-            RETURN_IF_EXCEPTION(scope, JSC::jsUndefined());
-            return jsValue;
-        }
+        if (auto* frame = downcast<Document>(m_context).frame())
+            RELEASE_AND_RETURN(scope, frame->script().evaluateModule(sourceURL, *moduleRecord, awaitedValue, resumeMode));
     } else {
         ASSERT(is<WorkerOrWorkletGlobalScope>(m_context));
-        if (auto* script = downcast<WorkerOrWorkletGlobalScope>(m_context).script()) {
-            auto jsValue = script->evaluateModule(*moduleRecord, awaitedValue, resumeMode);
-            RETURN_IF_EXCEPTION(scope, JSC::jsUndefined());
-            return jsValue;
-        }
+        if (auto* script = downcast<WorkerOrWorkletGlobalScope>(m_context).script())
+            RELEASE_AND_RETURN(scope, script->evaluateModule(*moduleRecord, awaitedValue, resumeMode));
     }
     return JSC::jsUndefined();