<!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>[209030] 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/209030">209030</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-11-28 15:23:40 -0800 (Mon, 28 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix exception scope verification failures in runtime/Operations.cpp/h.
https://bugs.webkit.org/show_bug.cgi?id=165046
Reviewed by Saam Barati.
Also switched to using returning { } instead of JSValue().
* runtime/Operations.cpp:
(JSC::jsAddSlowCase):
(JSC::jsIsObjectTypeOrNull):
* runtime/Operations.h:
(JSC::jsStringFromRegisterArray):
(JSC::jsStringFromArguments):
(JSC::jsLess):
(JSC::jsLessEq):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOperationscpp">trunk/Source/JavaScriptCore/runtime/Operations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOperationsh">trunk/Source/JavaScriptCore/runtime/Operations.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (209029 => 209030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-11-28 23:17:55 UTC (rev 209029)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-11-28 23:23:40 UTC (rev 209030)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-11-28 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ Fix exception scope verification failures in runtime/Operations.cpp/h.
+ https://bugs.webkit.org/show_bug.cgi?id=165046
+
+ Reviewed by Saam Barati.
+
+ Also switched to using returning { } instead of JSValue().
+
+ * runtime/Operations.cpp:
+ (JSC::jsAddSlowCase):
+ (JSC::jsIsObjectTypeOrNull):
+ * runtime/Operations.h:
+ (JSC::jsStringFromRegisterArray):
+ (JSC::jsStringFromArguments):
+ (JSC::jsLess):
+ (JSC::jsLessEq):
+
+2016-11-28 Mark Lam <mark.lam@apple.com>
+
</ins><span class="cx"> Fix exception scope verification failures in JSScope.cpp.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=165047
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Operations.cpp (209029 => 209030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Operations.cpp 2016-11-28 23:17:55 UTC (rev 209029)
+++ trunk/Source/JavaScriptCore/runtime/Operations.cpp 2016-11-28 23:23:40 UTC (rev 209030)
</span><span class="lines">@@ -46,17 +46,28 @@
</span><span class="cx"> VM& vm = callFrame->vm();
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx"> JSValue p1 = v1.toPrimitive(callFrame);
</span><del>- RETURN_IF_EXCEPTION(scope, JSValue());
</del><ins>+ RETURN_IF_EXCEPTION(scope, { });
</ins><span class="cx"> JSValue p2 = v2.toPrimitive(callFrame);
</span><del>- RETURN_IF_EXCEPTION(scope, JSValue());
</del><ins>+ RETURN_IF_EXCEPTION(scope, { });
</ins><span class="cx">
</span><del>- if (p1.isString())
- return jsString(callFrame, asString(p1), p2.toString(callFrame));
</del><ins>+ if (p1.isString()) {
+ JSString* p2String = p2.toString(callFrame);
+ RETURN_IF_EXCEPTION(scope, { });
+ scope.release();
+ return jsString(callFrame, asString(p1), p2String);
+ }
</ins><span class="cx">
</span><del>- if (p2.isString())
- return jsString(callFrame, p1.toString(callFrame), asString(p2));
</del><ins>+ if (p2.isString()) {
+ JSString* p1String = p1.toString(callFrame);
+ RETURN_IF_EXCEPTION(scope, { });
+ scope.release();
+ return jsString(callFrame, p1String, asString(p2));
+ }
</ins><span class="cx">
</span><del>- return jsNumber(p1.toNumber(callFrame) + p2.toNumber(callFrame));
</del><ins>+ double p1Number = p1.toNumber(callFrame);
+ RETURN_IF_EXCEPTION(scope, { });
+ scope.release();
+ return jsNumber(p1Number + p2.toNumber(callFrame));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue jsTypeStringForValue(VM& vm, JSGlobalObject* globalObject, JSValue v)
</span><span class="lines">@@ -96,6 +107,7 @@
</span><span class="cx">
</span><span class="cx"> bool jsIsObjectTypeOrNull(CallFrame* callFrame, JSValue v)
</span><span class="cx"> {
</span><ins>+ VM& vm = callFrame->vm();
</ins><span class="cx"> if (!v.isCell())
</span><span class="cx"> return v.isNull();
</span><span class="cx">
</span><span class="lines">@@ -103,11 +115,11 @@
</span><span class="cx"> if (type == StringType || type == SymbolType)
</span><span class="cx"> return false;
</span><span class="cx"> if (type >= ObjectType) {
</span><del>- if (asObject(v)->structure(callFrame->vm())->masqueradesAsUndefined(callFrame->lexicalGlobalObject()))
</del><ins>+ if (asObject(v)->structure(vm)->masqueradesAsUndefined(callFrame->lexicalGlobalObject()))
</ins><span class="cx"> return false;
</span><span class="cx"> CallData callData;
</span><span class="cx"> JSObject* object = asObject(v);
</span><del>- if (object->methodTable(callFrame->vm())->getCallData(object, callData) != CallType::None)
</del><ins>+ if (object->methodTable(vm)->getCallData(object, callData) != CallType::None)
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOperationsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Operations.h (209029 => 209030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Operations.h 2016-11-28 23:17:55 UTC (rev 209029)
+++ trunk/Source/JavaScriptCore/runtime/Operations.h 2016-11-28 23:23:40 UTC (rev 209030)
</span><span class="lines">@@ -126,7 +126,9 @@
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < count; ++i) {
</span><span class="cx"> JSValue v = strings[-static_cast<int>(i)].jsValue();
</span><del>- if (!ropeBuilder.append(v.toString(exec)))
</del><ins>+ JSString* string = v.toString(exec);
+ RETURN_IF_EXCEPTION(scope, { });
+ if (!ropeBuilder.append(string))
</ins><span class="cx"> return throwOutOfMemoryError(exec, scope);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -138,11 +140,15 @@
</span><span class="cx"> VM* vm = &exec->vm();
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(*vm);
</span><span class="cx"> JSRopeString::RopeBuilder ropeBuilder(*vm);
</span><del>- ropeBuilder.append(thisValue.toString(exec));
</del><ins>+ JSString* str = thisValue.toString(exec);
+ RETURN_IF_EXCEPTION(scope, { });
+ ropeBuilder.append(str);
</ins><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < exec->argumentCount(); ++i) {
</span><span class="cx"> JSValue v = exec->argument(i);
</span><del>- if (!ropeBuilder.append(v.toString(exec)))
</del><ins>+ JSString* str = v.toString(exec);
+ RETURN_IF_EXCEPTION(scope, { });
+ if (UNLIKELY(!ropeBuilder.append(str)))
</ins><span class="cx"> return throwOutOfMemoryError(exec, scope);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -155,6 +161,9 @@
</span><span class="cx"> template<bool leftFirst>
</span><span class="cx"> ALWAYS_INLINE bool jsLess(CallFrame* callFrame, JSValue v1, JSValue v2)
</span><span class="cx"> {
</span><ins>+ VM& vm = callFrame->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (v1.isInt32() && v2.isInt32())
</span><span class="cx"> return v1.asInt32() < v2.asInt32();
</span><span class="cx">
</span><span class="lines">@@ -172,11 +181,14 @@
</span><span class="cx"> bool wasNotString2;
</span><span class="cx"> if (leftFirst) {
</span><span class="cx"> wasNotString1 = v1.getPrimitiveNumber(callFrame, n1, p1);
</span><ins>+ RETURN_IF_EXCEPTION(scope, false);
</ins><span class="cx"> wasNotString2 = v2.getPrimitiveNumber(callFrame, n2, p2);
</span><span class="cx"> } else {
</span><span class="cx"> wasNotString2 = v2.getPrimitiveNumber(callFrame, n2, p2);
</span><ins>+ RETURN_IF_EXCEPTION(scope, false);
</ins><span class="cx"> wasNotString1 = v1.getPrimitiveNumber(callFrame, n1, p1);
</span><span class="cx"> }
</span><ins>+ RETURN_IF_EXCEPTION(scope, false);
</ins><span class="cx">
</span><span class="cx"> if (wasNotString1 | wasNotString2)
</span><span class="cx"> return n1 < n2;
</span><span class="lines">@@ -189,6 +201,9 @@
</span><span class="cx"> template<bool leftFirst>
</span><span class="cx"> ALWAYS_INLINE bool jsLessEq(CallFrame* callFrame, JSValue v1, JSValue v2)
</span><span class="cx"> {
</span><ins>+ VM& vm = callFrame->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (v1.isInt32() && v2.isInt32())
</span><span class="cx"> return v1.asInt32() <= v2.asInt32();
</span><span class="cx">
</span><span class="lines">@@ -206,11 +221,14 @@
</span><span class="cx"> bool wasNotString2;
</span><span class="cx"> if (leftFirst) {
</span><span class="cx"> wasNotString1 = v1.getPrimitiveNumber(callFrame, n1, p1);
</span><ins>+ RETURN_IF_EXCEPTION(scope, false);
</ins><span class="cx"> wasNotString2 = v2.getPrimitiveNumber(callFrame, n2, p2);
</span><span class="cx"> } else {
</span><span class="cx"> wasNotString2 = v2.getPrimitiveNumber(callFrame, n2, p2);
</span><ins>+ RETURN_IF_EXCEPTION(scope, false);
</ins><span class="cx"> wasNotString1 = v1.getPrimitiveNumber(callFrame, n1, p1);
</span><span class="cx"> }
</span><ins>+ RETURN_IF_EXCEPTION(scope, false);
</ins><span class="cx">
</span><span class="cx"> if (wasNotString1 | wasNotString2)
</span><span class="cx"> return n1 <= n2;
</span></span></pre>
</div>
</div>
</body>
</html>