<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[278206] trunk/Source/JavaScriptCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/278206">278206</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2021-05-28 09:58:38 -0700 (Fri, 28 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>The jsc shell should not continue executing after a termination has been received.
https://bugs.webkit.org/show_bug.cgi?id=226368
rdar://78013374

Reviewed by Saam Barati.

This patch makes the jsc shell forbid execution in all the places that it has
caught and seen a TerminationException.

* jsc.cpp:
(JSC_DEFINE_HOST_FUNCTION):
(checkException):
(runWithOptions):
(runInteractive):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (278205 => 278206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-05-28 16:52:21 UTC (rev 278205)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-05-28 16:58:38 UTC (rev 278206)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2021-05-28  Mark Lam  <mark.lam@apple.com>
+
+        The jsc shell should not continue executing after a termination has been received.
+        https://bugs.webkit.org/show_bug.cgi?id=226368
+        rdar://78013374
+
+        Reviewed by Saam Barati.
+
+        This patch makes the jsc shell forbid execution in all the places that it has
+        caught and seen a TerminationException.
+
+        * jsc.cpp:
+        (JSC_DEFINE_HOST_FUNCTION):
+        (checkException):
+        (runWithOptions):
+        (runInteractive):
+
</ins><span class="cx"> 2021-05-27  Robin Morisset  <rmorisset@apple.com>
</span><span class="cx"> 
</span><span class="cx">         AirAllocateStackByGraphColoring should use the optimized interference graphs from AirAllocateRegistersByGraphColoring
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (278205 => 278206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp      2021-05-28 16:52:21 UTC (rev 278205)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2021-05-28 16:58:38 UTC (rev 278206)
</span><span class="lines">@@ -1519,6 +1519,8 @@
</span><span class="cx">     stopWatch.stop();
</span><span class="cx"> 
</span><span class="cx">     if (exception) {
</span><ins>+        if (vm.isTerminationException(exception.get()))
+            vm.setExecutionForbidden();
</ins><span class="cx">         throwException(realm, scope, exception);
</span><span class="cx">         return JSValue::encode(jsUndefined());
</span><span class="cx">     }
</span><span class="lines">@@ -1548,6 +1550,8 @@
</span><span class="cx">     evaluate(realm, jscSource(source, callFrame->callerSourceOrigin(vm)), JSValue(), exception);
</span><span class="cx"> 
</span><span class="cx">     if (exception) {
</span><ins>+        if (vm.isTerminationException(exception.get()))
+            vm.setExecutionForbidden();
</ins><span class="cx">         scope.throwException(realm, exception);
</span><span class="cx">         return JSValue::encode(jsUndefined());
</span><span class="cx">     }
</span><span class="lines">@@ -1579,8 +1583,11 @@
</span><span class="cx"> 
</span><span class="cx">     NakedPtr<Exception> evaluationException;
</span><span class="cx">     JSValue result = evaluate(globalObject, jscSource(script, SourceOrigin { path }, fileName), JSValue(), evaluationException);
</span><del>-    if (evaluationException)
</del><ins>+    if (evaluationException) {
+        if (vm.isTerminationException(evaluationException.get()))
+            vm.setExecutionForbidden();
</ins><span class="cx">         throwException(globalObject, scope, evaluationException);
</span><ins>+    }
</ins><span class="cx">     return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1594,8 +1601,11 @@
</span><span class="cx"> 
</span><span class="cx">     NakedPtr<Exception> evaluationException;
</span><span class="cx">     JSValue result = evaluate(globalObject, jscSource(sourceCode, callFrame->callerSourceOrigin(vm)), JSValue(), evaluationException);
</span><del>-    if (evaluationException)
</del><ins>+    if (evaluationException) {
+        if (vm.isTerminationException(evaluationException.get()))
+            vm.setExecutionForbidden();
</ins><span class="cx">         throwException(globalObject, scope, evaluationException);
</span><ins>+    }
</ins><span class="cx">     return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1924,8 +1934,11 @@
</span><span class="cx"> 
</span><span class="cx">     NakedPtr<Exception> evaluationException;
</span><span class="cx">     JSValue result = evaluate(realm, jscSource(sourceCode, callFrame->callerSourceOrigin(vm)), JSValue(), evaluationException);
</span><del>-    if (evaluationException)
</del><ins>+    if (evaluationException) {
+        if (vm.isTerminationException(evaluationException.get()))
+            vm.setExecutionForbidden();
</ins><span class="cx">         throwException(globalObject, scope, evaluationException);
</span><ins>+    }
</ins><span class="cx">     return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -2961,9 +2974,12 @@
</span><span class="cx">         return valueCell == terminationError;
</span><span class="cx">     };
</span><span class="cx"> 
</span><del>-    if (options.m_treatWatchdogExceptionAsSuccess && isTerminationException(value)) {
-        ASSERT(hasException);
-        return;
</del><ins>+    if (isTerminationException(value)) {
+        vm.setExecutionForbidden();
+        if (options.m_treatWatchdogExceptionAsSuccess) {
+            ASSERT(hasException);
+            return;
+        }
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (!options.m_uncaughtExceptionName || !isLastFile) {
</span><span class="lines">@@ -3050,11 +3066,8 @@
</span><span class="cx">             NakedPtr<Exception> evaluationException;
</span><span class="cx">             JSValue returnValue = evaluate(globalObject, jscSource(scriptBuffer, sourceOrigin , fileName), JSValue(), evaluationException);
</span><span class="cx">             scope.assertNoException();
</span><del>-            if (evaluationException) {
-                if (vm.isTerminationException(evaluationException.get()))
-                    vm.setExecutionForbidden();
</del><ins>+            if (evaluationException)
</ins><span class="cx">                 returnValue = evaluationException->value();
</span><del>-            }
</del><span class="cx">             checkException(globalObject, isLastFile, evaluationException, returnValue, options, success);
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -3125,6 +3138,9 @@
</span><span class="cx">         NakedPtr<Exception> evaluationException;
</span><span class="cx">         JSValue returnValue = evaluate(globalObject, jscSource(line, sourceOrigin, sourceOrigin.string()), JSValue(), evaluationException);
</span><span class="cx"> #endif
</span><ins>+        if (vm.isTerminationException(evaluationException.get()))
+            vm.setExecutionForbidden();
+
</ins><span class="cx">         Expected<CString, UTF8ConversionError> utf8;
</span><span class="cx">         if (evaluationException) {
</span><span class="cx">             fputs("Exception: ", stdout);
</span></span></pre>
</div>
</div>

</body>
</html>