<!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>[208808] 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/208808">208808</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-11-16 13:05:43 -0800 (Wed, 16 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix exception scope checking in JSGlobalObject.cpp.
https://bugs.webkit.org/show_bug.cgi?id=164831
Reviewed by Saam Barati.
* runtime/JSGlobalObject.cpp:
(JSC::JSGlobalObject::init):
- Use a CatchScope here because we don't ever expect JSGlobalObject initialization
to fail with errors.
(JSC::JSGlobalObject::put):
- Fix exception check requirements.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (208807 => 208808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-11-16 21:02:10 UTC (rev 208807)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-11-16 21:05:43 UTC (rev 208808)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-11-16 Mark Lam <mark.lam@apple.com>
+
+ Fix exception scope checking in JSGlobalObject.cpp.
+ https://bugs.webkit.org/show_bug.cgi?id=164831
+
+ Reviewed by Saam Barati.
+
+ * runtime/JSGlobalObject.cpp:
+ (JSC::JSGlobalObject::init):
+ - Use a CatchScope here because we don't ever expect JSGlobalObject initialization
+ to fail with errors.
+ (JSC::JSGlobalObject::put):
+ - Fix exception check requirements.
+
</ins><span class="cx"> 2016-11-16 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, ARM build fix.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (208807 => 208808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2016-11-16 21:02:10 UTC (rev 208807)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2016-11-16 21:05:43 UTC (rev 208808)
</span><span class="lines">@@ -358,6 +358,7 @@
</span><span class="cx"> void JSGlobalObject::init(VM& vm)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(vm.currentThreadIsHoldingAPILock());
</span><ins>+ auto catchScope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> Base::setStructure(vm, Structure::toCacheableDictionaryTransition(vm, structure()));
</span><span class="cx">
</span><span class="lines">@@ -740,13 +741,20 @@
</span><span class="cx"> JSFunction* privateFuncConcatSlowPath = JSFunction::createBuiltinFunction(vm, arrayPrototypeConcatSlowPathCodeGenerator(vm), this);
</span><span class="cx">
</span><span class="cx"> JSObject* regExpProtoFlagsGetterObject = getGetterById(exec, m_regExpPrototype.get(), vm.propertyNames->flags);
</span><ins>+ ASSERT_UNUSED(catchScope, !catchScope.exception());
</ins><span class="cx"> JSObject* regExpProtoGlobalGetterObject = getGetterById(exec, m_regExpPrototype.get(), vm.propertyNames->global);
</span><ins>+ ASSERT(!catchScope.exception());
</ins><span class="cx"> m_regExpProtoGlobalGetter.set(vm, this, regExpProtoGlobalGetterObject);
</span><span class="cx"> JSObject* regExpProtoIgnoreCaseGetterObject = getGetterById(exec, m_regExpPrototype.get(), vm.propertyNames->ignoreCase);
</span><ins>+ ASSERT(!catchScope.exception());
</ins><span class="cx"> JSObject* regExpProtoMultilineGetterObject = getGetterById(exec, m_regExpPrototype.get(), vm.propertyNames->multiline);
</span><ins>+ ASSERT(!catchScope.exception());
</ins><span class="cx"> JSObject* regExpProtoSourceGetterObject = getGetterById(exec, m_regExpPrototype.get(), vm.propertyNames->source);
</span><ins>+ ASSERT(!catchScope.exception());
</ins><span class="cx"> JSObject* regExpProtoStickyGetterObject = getGetterById(exec, m_regExpPrototype.get(), vm.propertyNames->sticky);
</span><ins>+ ASSERT(!catchScope.exception());
</ins><span class="cx"> JSObject* regExpProtoUnicodeGetterObject = getGetterById(exec, m_regExpPrototype.get(), vm.propertyNames->unicode);
</span><ins>+ ASSERT(!catchScope.exception());
</ins><span class="cx"> m_regExpProtoUnicodeGetter.set(vm, this, regExpProtoUnicodeGetterObject);
</span><span class="cx"> JSObject* builtinRegExpExec = asObject(m_regExpPrototype->getDirect(vm, vm.propertyNames->exec).asCell());
</span><span class="cx"> m_regExpProtoExec.set(vm, this, builtinRegExpExec);
</span><span class="lines">@@ -893,7 +901,6 @@
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> ExecState* exec = globalExec();
</span><del>- auto scope = DECLARE_THROW_SCOPE(vm);
</del><span class="cx">
</span><span class="cx"> auto setupAdaptiveWatchpoint = [&] (JSObject* base, const Identifier& ident) -> ObjectPropertyCondition {
</span><span class="cx"> // Performing these gets should not throw.
</span><span class="lines">@@ -900,10 +907,10 @@
</span><span class="cx"> PropertySlot slot(base, PropertySlot::InternalMethodType::Get);
</span><span class="cx"> bool result = base->getOwnPropertySlot(base, exec, ident, slot);
</span><span class="cx"> ASSERT_UNUSED(result, result);
</span><del>- ASSERT_UNUSED(scope, !scope.exception());
</del><ins>+ ASSERT(!catchScope.exception());
</ins><span class="cx"> RELEASE_ASSERT(slot.isCacheableValue());
</span><span class="cx"> JSValue functionValue = slot.getValue(exec, ident);
</span><del>- ASSERT_UNUSED(scope, !scope.exception());
</del><ins>+ ASSERT(!catchScope.exception());
</ins><span class="cx"> ASSERT(jsDynamicCast<JSFunction*>(functionValue));
</span><span class="cx">
</span><span class="cx"> ObjectPropertyCondition condition = generateConditionForSelfEquivalence(m_vm, nullptr, base, ident.impl());
</span><span class="lines">@@ -934,17 +941,24 @@
</span><span class="cx">
</span><span class="cx"> bool JSGlobalObject::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSGlobalObject* thisObject = jsCast<JSGlobalObject*>(cell);
</span><span class="cx"> ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(thisObject));
</span><span class="cx">
</span><del>- if (UNLIKELY(isThisValueAltered(slot, thisObject)))
</del><ins>+ if (UNLIKELY(isThisValueAltered(slot, thisObject))) {
+ scope.release();
</ins><span class="cx"> return ordinarySetSlow(exec, thisObject, propertyName, value, slot.thisValue(), slot.isStrictMode());
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> bool shouldThrowReadOnlyError = slot.isStrictMode();
</span><span class="cx"> bool ignoreReadOnlyErrors = false;
</span><span class="cx"> bool putResult = false;
</span><del>- if (symbolTablePutTouchWatchpointSet(thisObject, exec, propertyName, value, shouldThrowReadOnlyError, ignoreReadOnlyErrors, putResult))
</del><ins>+ bool done = symbolTablePutTouchWatchpointSet(thisObject, exec, propertyName, value, shouldThrowReadOnlyError, ignoreReadOnlyErrors, putResult);
+ ASSERT((!!scope.exception() == (done && !putResult)) || !shouldThrowReadOnlyError);
+ if (done)
</ins><span class="cx"> return putResult;
</span><ins>+ scope.release();
</ins><span class="cx"> return Base::put(thisObject, exec, propertyName, value, slot);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>