Changeset 214016 in webkit

Timestamp:

Mar 15, 2017 3:49:36 PM (7 years ago)

Author:

mark.lam@apple.com

Message:

Fix exception scope verification failures in jsc.cpp.
​https://bugs.webkit.org/show_bug.cgi?id=164968

Reviewed by Saam Barati.

• jsc.cpp:

(WTF::CustomGetter::customGetter):

(GlobalObject::moduleLoaderResolve):
(GlobalObject::moduleLoaderFetch):

• The only way modules would throw an exception is if we encounter an OutOfMemory error. This should be extremely rare. At this point, I don't think it's worth doing the dance to propagate the exception when this happens. Instead, we'll simply do a RELEASE_ASSERT that we don't see any exceptions here.

(functionRun):
(functionRunString):
(functionLoadModule):
(functionCheckModuleSyntax):
(box):
(dumpException):
(runWithScripts):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jsc.cpp (modified) (12 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-03-15  Mark Lam  <mark.lam@apple.com>
+
+        Fix exception scope verification failures in jsc.cpp.
+        https://bugs.webkit.org/show_bug.cgi?id=164968
+
+        Reviewed by Saam Barati.
+
+        * jsc.cpp:
+        (WTF::CustomGetter::customGetter):
+
+        (GlobalObject::moduleLoaderResolve):
+        (GlobalObject::moduleLoaderFetch):
+        - The only way modules would throw an exception is if we encounter an OutOfMemory
+          error.  This should be extremely rare.  At this point, I don't think it's worth
+          doing the dance to propagate the exception when this happens.  Instead, we'll
+          simply do a RELEASE_ASSERT that we don't see any exceptions here.
+
+        (functionRun):
+        (functionRunString):
+        (functionLoadModule):
+        (functionCheckModuleSyntax):
+        (box):
+        (dumpException):
+        (runWithScripts):
+
 2017-03-15  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/jsc.cpp

@@ -391 +391 @@
             return throwVMTypeError(exec, scope);
         bool shouldThrow = thisObject->get(exec, PropertyName(Identifier::fromString(exec, "shouldThrow"))).toBoolean(exec);
+        RETURN_IF_EXCEPTION(scope, encodedJSValue());
         if (shouldThrow)
             return throwVMTypeError(exec, scope);
@@ -1595 +1596 @@
 
     JSInternalPromiseDeferred* deferred = JSInternalPromiseDeferred::create(exec, globalObject);
+    RELEASE_ASSERT(!scope.exception());
     const Identifier key = keyValue.toPropertyKey(exec);
     if (UNLIKELY(scope.exception())) {
@@ -1630 +1632 @@
     if (!directoryName)
         return deferred->reject(exec, createError(exec, makeString("Could not resolve the referrer name '", String(referrer.impl()), "'.")));
-    return deferred->resolve(exec, jsString(exec, resolvePath(directoryName.value(), ModuleName(key.impl()))));
+    auto result = deferred->resolve(exec, jsString(exec, resolvePath(directoryName.value(), ModuleName(key.impl()))));
+    RELEASE_ASSERT(!scope.exception());
+    return result;
 }
 
@@ -1718 +1722 @@
         return deferred->reject(exec, createError(exec, makeString("Could not open file '", moduleKey, "'.")));
 
-    return deferred->resolve(exec, JSSourceCode::create(exec->vm(), makeSource(stringFromUTF(utf8), SourceOrigin { moduleKey }, moduleKey, TextPosition(), SourceProviderSourceType::Module)));
+    auto result = deferred->resolve(exec, JSSourceCode::create(exec->vm(), makeSource(stringFromUTF(utf8), SourceOrigin { moduleKey }, moduleKey, TextPosition(), SourceProviderSourceType::Module)));
+    RELEASE_ASSERT(!scope.exception());
+    return result;
 }
 
@@ -2095 +2101 @@
 
     JSArray* array = constructEmptyArray(globalObject->globalExec(), 0);
-    for (unsigned i = 1; i < exec->argumentCount(); ++i)
+    RETURN_IF_EXCEPTION(scope, encodedJSValue());
+    for (unsigned i = 1; i < exec->argumentCount(); ++i) {
         array->putDirectIndex(globalObject->globalExec(), i - 1, exec->uncheckedArgument(i));
+        RETURN_IF_EXCEPTION(scope, encodedJSValue());
+    }
     globalObject->putDirect(
         vm, Identifier::fromString(globalObject->globalExec(), "arguments"), array);
@@ -2125 +2134 @@
 
     JSArray* array = constructEmptyArray(globalObject->globalExec(), 0);
-    for (unsigned i = 1; i < exec->argumentCount(); ++i)
+    RETURN_IF_EXCEPTION(scope, encodedJSValue());
+    for (unsigned i = 1; i < exec->argumentCount(); ++i) {
         array->putDirectIndex(globalObject->globalExec(), i - 1, exec->uncheckedArgument(i));
+        RETURN_IF_EXCEPTION(scope, encodedJSValue());
+    }
     globalObject->putDirect(
         vm, Identifier::fromString(globalObject->globalExec(), "arguments"), array);
@@ -2918 +2930 @@
 
     promise->then(exec, nullptr, errorHandler);
+    RETURN_IF_EXCEPTION(scope, encodedJSValue());
     vm.drainMicrotasks();
     if (error)
@@ -2960 +2973 @@
     ParserError error;
     bool validSyntax = checkModuleSyntax(exec, makeSource(source, { }, String(), TextPosition(), SourceProviderSourceType::Module), error);
+    RETURN_IF_EXCEPTION(scope, encodedJSValue());
     stopWatch.stop();
 
@@ -3052 +3066 @@
 static JSValue box(ExecState* exec, VM& vm, JSValue wasmValue)
 {
+    auto scope = DECLARE_CATCH_SCOPE(vm);
 
     JSString* type = asString(wasmValue.get(exec, makeIdentifier(vm, "type")));
+    ASSERT_UNUSED(scope, !scope.exception());
     JSValue value = wasmValue.get(exec, makeIdentifier(vm, "value"));
+    ASSERT(!scope.exception());
 
     auto unboxString = [&] (const char* hexFormat, const char* decFormat, auto& result) {
@@ -3309 +3326 @@
 
     Identifier nameID = Identifier::fromString(globalObject->globalExec(), "name");
+    CHECK_EXCEPTION();
     Identifier fileNameID = Identifier::fromString(globalObject->globalExec(), "sourceURL");
+    CHECK_EXCEPTION();
     Identifier lineNumberID = Identifier::fromString(globalObject->globalExec(), "line");
+    CHECK_EXCEPTION();
     Identifier stackID = Identifier::fromString(globalObject->globalExec(), "stack");
-    
+    CHECK_EXCEPTION();
+
     JSValue nameValue = exception.get(globalObject->globalExec(), nameID);
     CHECK_EXCEPTION();
@@ -3405 +3426 @@
                 scriptBuffer.append("\"use strict\";\n", strlen("\"use strict\";\n"));
 
-            if (isModule)
+            if (isModule) {
                 promise = loadAndEvaluateModule(globalObject->globalExec(), fileName);
-            else {
+                RELEASE_ASSERT(!scope.exception());
+            } else {
                 if (!fetchScriptFromLocalFileSystem(fileName, scriptBuffer))
                     return false; // fail early so we can catch missing files
@@ -3435 +3457 @@
 
             promise->then(globalObject->globalExec(), fulfillHandler, rejectHandler);
+            RELEASE_ASSERT(!scope.exception());
             vm.drainMicrotasks();
         } else {