<!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>[208952] 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/208952">208952</a></dd>

<dt>Author</dt> <dd>mark.lam@apple.com</dd>

<dt>Date</dt> <dd>2016-11-21 15:24:18 -0800 (Mon, 21 Nov 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>Fix exception scope verification failures in runtime/Error* files.

https://bugs.webkit.org/show_bug.cgi?id=164998

Reviewed by Darin Adler.

* runtime/ErrorConstructor.cpp:

(JSC::Interpreter::constructWithErrorConstructor):

* runtime/ErrorInstance.cpp:

(JSC::ErrorInstance::create):

* runtime/ErrorInstance.h:

* runtime/ErrorPrototype.cpp:

(JSC::errorProtoFuncToString):</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>

<li><a href="#trunkSourceJavaScriptCoreruntimeErrorConstructorcpp">trunk/Source/JavaScriptCore/runtime/ErrorConstructor.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCoreruntimeErrorInstancecpp">trunk/Source/JavaScriptCore/runtime/ErrorInstance.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCoreruntimeErrorInstanceh">trunk/Source/JavaScriptCore/runtime/ErrorInstance.h</a></li>

<li><a href="#trunkSourceJavaScriptCoreruntimeErrorPrototypecpp">trunk/Source/JavaScriptCore/runtime/ErrorPrototype.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceJavaScriptCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (208951 => 208952)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-11-21 20:32:42 UTC (rev 208951)

+++ trunk/Source/JavaScriptCore/ChangeLog        2016-11-21 23:24:18 UTC (rev 208952)

</span><span class="lines">@@ -1,5 +1,20 @@

</span><span class="cx"> 2016-11-21  Mark Lam  &lt;mark.lam@apple.com&gt;

</span><span class="cx"> 

</span><ins>+        Fix exception scope verification failures in runtime/Error* files.

+        https://bugs.webkit.org/show_bug.cgi?id=164998

+

+        Reviewed by Darin Adler.

+

+        * runtime/ErrorConstructor.cpp:

+        (JSC::Interpreter::constructWithErrorConstructor):

+        * runtime/ErrorInstance.cpp:

+        (JSC::ErrorInstance::create):

+        * runtime/ErrorInstance.h:

+        * runtime/ErrorPrototype.cpp:

+        (JSC::errorProtoFuncToString):

+

+2016-11-21  Mark Lam  &lt;mark.lam@apple.com&gt;

+

</ins><span class="cx">         Fix exception scope verification failures in *Executable.cpp files.

</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=164996

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreruntimeErrorConstructorcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ErrorConstructor.cpp (208951 => 208952)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/runtime/ErrorConstructor.cpp        2016-11-21 20:32:42 UTC (rev 208951)

+++ trunk/Source/JavaScriptCore/runtime/ErrorConstructor.cpp        2016-11-21 23:24:18 UTC (rev 208952)

</span><span class="lines">@@ -55,6 +55,7 @@

</span><span class="cx">     JSValue message = exec-&gt;argument(0);

</span><span class="cx">     Structure* errorStructure = InternalFunction::createSubclassStructure(exec, exec-&gt;newTarget(), asInternalFunction(exec-&gt;callee())-&gt;globalObject()-&gt;errorStructure());

</span><span class="cx">     RETURN_IF_EXCEPTION(scope, encodedJSValue());

</span><ins>+    scope.release();

</ins><span class="cx">     return JSValue::encode(ErrorInstance::create(exec, errorStructure, message, nullptr, TypeNothing, false));

</span><span class="cx"> }

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreruntimeErrorInstancecpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ErrorInstance.cpp (208951 => 208952)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/runtime/ErrorInstance.cpp        2016-11-21 20:32:42 UTC (rev 208951)

+++ trunk/Source/JavaScriptCore/runtime/ErrorInstance.cpp        2016-11-21 23:24:18 UTC (rev 208952)

</span><span class="lines">@@ -39,6 +39,15 @@

</span><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><ins>+ErrorInstance* ErrorInstance::create(ExecState* state, Structure* structure, JSValue message, SourceAppender appender, RuntimeType type, bool useCurrentFrame)

+{

+    VM&amp; vm = state-&gt;vm();

+    auto scope = DECLARE_THROW_SCOPE(vm);

+    String messageString = message.isUndefined() ? String() : message.toWTFString(state);

+    RETURN_IF_EXCEPTION(scope, nullptr);

+    return create(state, vm, structure, messageString, appender, type, useCurrentFrame);

+}

+

</ins><span class="cx"> static void appendSourceToError(CallFrame* callFrame, ErrorInstance* exception, unsigned bytecodeOffset)

</span><span class="cx"> {

</span><span class="cx">     ErrorInstance::SourceAppender appender = exception-&gt;sourceAppender();

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreruntimeErrorInstanceh"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ErrorInstance.h (208951 => 208952)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/runtime/ErrorInstance.h        2016-11-21 20:32:42 UTC (rev 208951)

+++ trunk/Source/JavaScriptCore/runtime/ErrorInstance.h        2016-11-21 23:24:18 UTC (rev 208952)

</span><span class="lines">@@ -49,10 +49,7 @@

</span><span class="cx">         return instance;

</span><span class="cx">     }

</span><span class="cx"> 

</span><del>-    static ErrorInstance* create(ExecState* exec, Structure* structure, JSValue message, SourceAppender appender = nullptr, RuntimeType type = TypeNothing, bool useCurrentFrame = true)

-    {

-        return create(exec, exec-&gt;vm(), structure, message.isUndefined() ? String() : message.toString(exec)-&gt;value(exec), appender, type, useCurrentFrame);

-    }

</del><ins>+    static ErrorInstance* create(ExecState*, Structure*, JSValue message, SourceAppender = nullptr, RuntimeType = TypeNothing, bool useCurrentFrame = true);

</ins><span class="cx"> 

</span><span class="cx">     static void addErrorInfo(ExecState*, VM&amp;, JSObject*, bool = true);

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreruntimeErrorPrototypecpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ErrorPrototype.cpp (208951 => 208952)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/runtime/ErrorPrototype.cpp        2016-11-21 20:32:42 UTC (rev 208951)

+++ trunk/Source/JavaScriptCore/runtime/ErrorPrototype.cpp        2016-11-21 23:24:18 UTC (rev 208952)

</span><span class="lines">@@ -80,6 +80,7 @@

</span><span class="cx"> 

</span><span class="cx">     // Guard against recursion!

</span><span class="cx">     StringRecursionChecker checker(exec, thisObj);

</span><ins>+    ASSERT(!scope.exception() || checker.earlyReturnValue());

</ins><span class="cx">     if (JSValue earlyReturnValue = checker.earlyReturnValue())

</span><span class="cx">         return JSValue::encode(earlyReturnValue);

</span><span class="cx"> 

</span></span></pre>

</div>

</div>

</body>

</html>