<!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>[196966] 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/196966">196966</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-02-22 16:51:02 -0800 (Mon, 22 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>InternalFunction::createSubclassStructure doesn't take into account that get() might throw
https://bugs.webkit.org/show_bug.cgi?id=154548
Reviewed by Mark Lam and Geoffrey Garen and Andreas Kling.
InternalFunction::createSubclassStructure calls newTarget.get(...) which can throw
an exception. Neither the function nor the call sites of the function took this into
account. This patch audits the call sites of the function to make it work in
the event that an exception is thrown.
* runtime/BooleanConstructor.cpp:
(JSC::constructWithBooleanConstructor):
* runtime/DateConstructor.cpp:
(JSC::constructDate):
* runtime/ErrorConstructor.cpp:
(JSC::Interpreter::constructWithErrorConstructor):
* runtime/FunctionConstructor.cpp:
(JSC::constructFunctionSkippingEvalEnabledCheck):
* runtime/InternalFunction.cpp:
(JSC::InternalFunction::createSubclassStructure):
* runtime/JSArrayBufferConstructor.cpp:
(JSC::constructArrayBuffer):
* runtime/JSGenericTypedArrayViewConstructorInlines.h:
(JSC::constructGenericTypedArrayView):
* runtime/JSGlobalObject.h:
(JSC::constructEmptyArray):
(JSC::constructArray):
(JSC::constructArrayNegativeIndexed):
* runtime/JSPromiseConstructor.cpp:
(JSC::constructPromise):
* runtime/MapConstructor.cpp:
(JSC::constructMap):
* runtime/NativeErrorConstructor.cpp:
(JSC::Interpreter::constructWithNativeErrorConstructor):
* runtime/NumberConstructor.cpp:
(JSC::constructWithNumberConstructor):
* runtime/RegExpConstructor.cpp:
(JSC::getRegExpStructure):
(JSC::constructRegExp):
(JSC::constructWithRegExpConstructor):
* runtime/SetConstructor.cpp:
(JSC::constructSet):
* runtime/StringConstructor.cpp:
(JSC::constructWithStringConstructor):
(JSC::StringConstructor::getConstructData):
* runtime/WeakMapConstructor.cpp:
(JSC::constructWeakMap):
* runtime/WeakSetConstructor.cpp:
(JSC::constructWeakSet):
* tests/stress/create-subclass-structure-might-throw.js: Added.
(assert):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeBooleanConstructorcpp">trunk/Source/JavaScriptCore/runtime/BooleanConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeDateConstructorcpp">trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeErrorConstructorcpp">trunk/Source/JavaScriptCore/runtime/ErrorConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeFunctionConstructorcpp">trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeInternalFunctioncpp">trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSArrayBufferConstructorcpp">trunk/Source/JavaScriptCore/runtime/JSArrayBufferConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewConstructorInlinesh">trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjecth">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSPromiseConstructorcpp">trunk/Source/JavaScriptCore/runtime/JSPromiseConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeMapConstructorcpp">trunk/Source/JavaScriptCore/runtime/MapConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeNativeErrorConstructorcpp">trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeNumberConstructorcpp">trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpConstructorcpp">trunk/Source/JavaScriptCore/runtime/RegExpConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeSetConstructorcpp">trunk/Source/JavaScriptCore/runtime/SetConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStringConstructorcpp">trunk/Source/JavaScriptCore/runtime/StringConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWeakMapConstructorcpp">trunk/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWeakSetConstructorcpp">trunk/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstresscreatesubclassstructuremightthrowjs">trunk/Source/JavaScriptCore/tests/stress/create-subclass-structure-might-throw.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (196965 => 196966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-23 00:48:48 UTC (rev 196965)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-23 00:51:02 UTC (rev 196966)
</span><span class="lines">@@ -1,3 +1,57 @@
</span><ins>+2016-02-22 Saam barati <sbarati@apple.com>
+
+ InternalFunction::createSubclassStructure doesn't take into account that get() might throw
+ https://bugs.webkit.org/show_bug.cgi?id=154548
+
+ Reviewed by Mark Lam and Geoffrey Garen and Andreas Kling.
+
+ InternalFunction::createSubclassStructure calls newTarget.get(...) which can throw
+ an exception. Neither the function nor the call sites of the function took this into
+ account. This patch audits the call sites of the function to make it work in
+ the event that an exception is thrown.
+
+ * runtime/BooleanConstructor.cpp:
+ (JSC::constructWithBooleanConstructor):
+ * runtime/DateConstructor.cpp:
+ (JSC::constructDate):
+ * runtime/ErrorConstructor.cpp:
+ (JSC::Interpreter::constructWithErrorConstructor):
+ * runtime/FunctionConstructor.cpp:
+ (JSC::constructFunctionSkippingEvalEnabledCheck):
+ * runtime/InternalFunction.cpp:
+ (JSC::InternalFunction::createSubclassStructure):
+ * runtime/JSArrayBufferConstructor.cpp:
+ (JSC::constructArrayBuffer):
+ * runtime/JSGenericTypedArrayViewConstructorInlines.h:
+ (JSC::constructGenericTypedArrayView):
+ * runtime/JSGlobalObject.h:
+ (JSC::constructEmptyArray):
+ (JSC::constructArray):
+ (JSC::constructArrayNegativeIndexed):
+ * runtime/JSPromiseConstructor.cpp:
+ (JSC::constructPromise):
+ * runtime/MapConstructor.cpp:
+ (JSC::constructMap):
+ * runtime/NativeErrorConstructor.cpp:
+ (JSC::Interpreter::constructWithNativeErrorConstructor):
+ * runtime/NumberConstructor.cpp:
+ (JSC::constructWithNumberConstructor):
+ * runtime/RegExpConstructor.cpp:
+ (JSC::getRegExpStructure):
+ (JSC::constructRegExp):
+ (JSC::constructWithRegExpConstructor):
+ * runtime/SetConstructor.cpp:
+ (JSC::constructSet):
+ * runtime/StringConstructor.cpp:
+ (JSC::constructWithStringConstructor):
+ (JSC::StringConstructor::getConstructData):
+ * runtime/WeakMapConstructor.cpp:
+ (JSC::constructWeakMap):
+ * runtime/WeakSetConstructor.cpp:
+ (JSC::constructWeakSet):
+ * tests/stress/create-subclass-structure-might-throw.js: Added.
+ (assert):
+
</ins><span class="cx"> 2016-02-22 Ting-Wei Lan <lantw44@gmail.com>
</span><span class="cx">
</span><span class="cx"> Fix build and implement functions to retrieve registers on FreeBSD
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeBooleanConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/BooleanConstructor.cpp (196965 => 196966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/BooleanConstructor.cpp 2016-02-23 00:48:48 UTC (rev 196965)
+++ trunk/Source/JavaScriptCore/runtime/BooleanConstructor.cpp 2016-02-23 00:51:02 UTC (rev 196966)
</span><span class="lines">@@ -50,6 +50,8 @@
</span><span class="cx"> {
</span><span class="cx"> JSValue boolean = jsBoolean(exec->argument(0).toBoolean(exec));
</span><span class="cx"> Structure* booleanStructure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), asInternalFunction(exec->callee())->globalObject()->booleanObjectStructure());
</span><ins>+ if (exec->hadException())
+ return JSValue::encode(JSValue());
</ins><span class="cx"> BooleanObject* obj = BooleanObject::create(exec->vm(), booleanStructure);
</span><span class="cx"> obj->setInternalValue(exec->vm(), boolean);
</span><span class="cx"> return JSValue::encode(obj);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeDateConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp (196965 => 196966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp 2016-02-23 00:48:48 UTC (rev 196965)
+++ trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp 2016-02-23 00:51:02 UTC (rev 196966)
</span><span class="lines">@@ -172,6 +172,8 @@
</span><span class="cx"> value = millisecondsFromComponents(exec, args, WTF::LocalTime);
</span><span class="cx">
</span><span class="cx"> Structure* dateStructure = InternalFunction::createSubclassStructure(exec, newTarget, globalObject->dateStructure());
</span><ins>+ if (exec->hadException())
+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> return DateInstance::create(vm, dateStructure, value);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeErrorConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ErrorConstructor.cpp (196965 => 196966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ErrorConstructor.cpp 2016-02-23 00:48:48 UTC (rev 196965)
+++ trunk/Source/JavaScriptCore/runtime/ErrorConstructor.cpp 2016-02-23 00:51:02 UTC (rev 196966)
</span><span class="lines">@@ -52,6 +52,8 @@
</span><span class="cx"> {
</span><span class="cx"> JSValue message = exec->argumentCount() ? exec->argument(0) : jsUndefined();
</span><span class="cx"> Structure* errorStructure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), asInternalFunction(exec->callee())->globalObject()->errorStructure());
</span><ins>+ if (exec->hadException())
+ return JSValue::encode(JSValue());
</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="trunkSourceJavaScriptCoreruntimeFunctionConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp (196965 => 196966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp 2016-02-23 00:48:48 UTC (rev 196965)
+++ trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp 2016-02-23 00:51:02 UTC (rev 196966)
</span><span class="lines">@@ -124,8 +124,11 @@
</span><span class="cx"> return exec->vm().throwException(exec, exception);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ Structure* subclassStructure = InternalFunction::createSubclassStructure(exec, newTarget, globalObject->functionStructure());
+ if (exec->hadException())
+ return nullptr;
</ins><span class="cx">
</span><del>- return JSFunction::create(exec->vm(), function, globalObject, InternalFunction::createSubclassStructure(exec, newTarget, globalObject->functionStructure()));
</del><ins>+ return JSFunction::create(exec->vm(), function, globalObject, subclassStructure);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ECMA 15.3.2 The Function Constructor
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeInternalFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp (196965 => 196966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp 2016-02-23 00:48:48 UTC (rev 196965)
+++ trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp 2016-02-23 00:51:02 UTC (rev 196966)
</span><span class="lines">@@ -97,10 +97,13 @@
</span><span class="cx">
</span><span class="cx"> // Note, Reflect.construct might cause the profile to churn but we don't care.
</span><span class="cx"> JSObject* prototype = jsDynamicCast<JSObject*>(newTarget.get(exec, exec->propertyNames().prototype));
</span><ins>+ ASSERT(!exec->hadException());
</ins><span class="cx"> if (prototype)
</span><span class="cx"> return targetFunction->rareData(vm)->createInternalFunctionAllocationStructureFromBase(vm, prototype, baseClass);
</span><span class="cx"> } else {
</span><span class="cx"> JSObject* prototype = jsDynamicCast<JSObject*>(newTarget.get(exec, exec->propertyNames().prototype));
</span><ins>+ if (exec->hadException())
+ return nullptr;
</ins><span class="cx"> if (prototype) {
</span><span class="cx"> // This only happens if someone Reflect.constructs our builtin constructor with another builtin constructor as the new.target.
</span><span class="cx"> // Thus, we don't care about the cost of looking up the structure from our hash table every time.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSArrayBufferConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSArrayBufferConstructor.cpp (196965 => 196966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSArrayBufferConstructor.cpp 2016-02-23 00:48:48 UTC (rev 196965)
+++ trunk/Source/JavaScriptCore/runtime/JSArrayBufferConstructor.cpp 2016-02-23 00:51:02 UTC (rev 196966)
</span><span class="lines">@@ -97,6 +97,8 @@
</span><span class="cx"> return throwVMError(exec, createOutOfMemoryError(exec));
</span><span class="cx">
</span><span class="cx"> Structure* arrayBufferStructure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), constructor->globalObject()->arrayBufferStructure());
</span><ins>+ if (exec->hadException())
+ return JSValue::encode(JSValue());
</ins><span class="cx"> JSArrayBuffer* result = JSArrayBuffer::create(exec->vm(), arrayBufferStructure, buffer.release());
</span><span class="cx">
</span><span class="cx"> return JSValue::encode(result);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewConstructorInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h (196965 => 196966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h 2016-02-23 00:48:48 UTC (rev 196965)
+++ trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h 2016-02-23 00:51:02 UTC (rev 196966)
</span><span class="lines">@@ -219,6 +219,8 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL constructGenericTypedArrayView(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> Structure* structure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), asInternalFunction(exec->callee())->globalObject()->typedArrayStructure(ViewClass::TypedArrayStorageType));
</span><ins>+ if (exec->hadException())
+ return JSValue::encode(JSValue());
</ins><span class="cx">
</span><span class="cx"> size_t argCount = exec->argumentCount();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h (196965 => 196966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2016-02-23 00:48:48 UTC (rev 196965)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2016-02-23 00:51:02 UTC (rev 196966)
</span><span class="lines">@@ -731,6 +731,8 @@
</span><span class="cx"> structure = globalObject->arrayStructureForIndexingTypeDuringAllocation(exec, ArrayWithArrayStorage, newTarget);
</span><span class="cx"> else
</span><span class="cx"> structure = globalObject->arrayStructureForProfileDuringAllocation(exec, profile, newTarget);
</span><ins>+ if (exec->hadException())
+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> return ArrayAllocationProfile::updateLastAllocationFor(profile, JSArray::create(exec->vm(), structure, initialLength));
</span><span class="cx"> }
</span><span class="lines">@@ -742,7 +744,10 @@
</span><span class="cx">
</span><span class="cx"> inline JSArray* constructArray(ExecState* exec, ArrayAllocationProfile* profile, JSGlobalObject* globalObject, const ArgList& values, JSValue newTarget = JSValue())
</span><span class="cx"> {
</span><del>- return ArrayAllocationProfile::updateLastAllocationFor(profile, constructArray(exec, globalObject->arrayStructureForProfileDuringAllocation(exec, profile, newTarget), values));
</del><ins>+ Structure* structure = globalObject->arrayStructureForProfileDuringAllocation(exec, profile, newTarget);
+ if (exec->hadException())
+ return nullptr;
+ return ArrayAllocationProfile::updateLastAllocationFor(profile, constructArray(exec, structure, values));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline JSArray* constructArray(ExecState* exec, ArrayAllocationProfile* profile, const ArgList& values, JSValue newTarget = JSValue())
</span><span class="lines">@@ -752,7 +757,10 @@
</span><span class="cx">
</span><span class="cx"> inline JSArray* constructArray(ExecState* exec, ArrayAllocationProfile* profile, JSGlobalObject* globalObject, const JSValue* values, unsigned length, JSValue newTarget = JSValue())
</span><span class="cx"> {
</span><del>- return ArrayAllocationProfile::updateLastAllocationFor(profile, constructArray(exec, globalObject->arrayStructureForProfileDuringAllocation(exec, profile, newTarget), values, length));
</del><ins>+ Structure* structure = globalObject->arrayStructureForProfileDuringAllocation(exec, profile, newTarget);
+ if (exec->hadException())
+ return nullptr;
+ return ArrayAllocationProfile::updateLastAllocationFor(profile, constructArray(exec, structure, values, length));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline JSArray* constructArray(ExecState* exec, ArrayAllocationProfile* profile, const JSValue* values, unsigned length, JSValue newTarget = JSValue())
</span><span class="lines">@@ -762,7 +770,10 @@
</span><span class="cx">
</span><span class="cx"> inline JSArray* constructArrayNegativeIndexed(ExecState* exec, ArrayAllocationProfile* profile, JSGlobalObject* globalObject, const JSValue* values, unsigned length, JSValue newTarget = JSValue())
</span><span class="cx"> {
</span><del>- return ArrayAllocationProfile::updateLastAllocationFor(profile, constructArrayNegativeIndexed(exec, globalObject->arrayStructureForProfileDuringAllocation(exec, profile, newTarget), values, length));
</del><ins>+ Structure* structure = globalObject->arrayStructureForProfileDuringAllocation(exec, profile, newTarget);
+ if (exec->hadException())
+ return nullptr;
+ return ArrayAllocationProfile::updateLastAllocationFor(profile, constructArrayNegativeIndexed(exec, structure, values, length));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline JSArray* constructArrayNegativeIndexed(ExecState* exec, ArrayAllocationProfile* profile, const JSValue* values, unsigned length, JSValue newTarget = JSValue())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSPromiseConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSPromiseConstructor.cpp (196965 => 196966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSPromiseConstructor.cpp 2016-02-23 00:48:48 UTC (rev 196965)
+++ trunk/Source/JavaScriptCore/runtime/JSPromiseConstructor.cpp 2016-02-23 00:51:02 UTC (rev 196966)
</span><span class="lines">@@ -104,6 +104,8 @@
</span><span class="cx"> return throwVMTypeError(exec);
</span><span class="cx">
</span><span class="cx"> Structure* promiseStructure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), globalObject->promiseStructure());
</span><ins>+ if (exec->hadException())
+ return JSValue::encode(JSValue());
</ins><span class="cx"> JSPromise* promise = JSPromise::create(vm, promiseStructure);
</span><span class="cx"> promise->initialize(exec, globalObject, exec->argument(0));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeMapConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/MapConstructor.cpp (196965 => 196966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/MapConstructor.cpp 2016-02-23 00:48:48 UTC (rev 196965)
+++ trunk/Source/JavaScriptCore/runtime/MapConstructor.cpp 2016-02-23 00:51:02 UTC (rev 196966)
</span><span class="lines">@@ -57,6 +57,8 @@
</span><span class="cx"> {
</span><span class="cx"> JSGlobalObject* globalObject = asInternalFunction(exec->callee())->globalObject();
</span><span class="cx"> Structure* mapStructure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), globalObject->mapStructure());
</span><ins>+ if (exec->hadException())
+ return JSValue::encode(JSValue());
</ins><span class="cx"> JSMap* map = JSMap::create(exec, mapStructure);
</span><span class="cx"> JSValue iterable = exec->argument(0);
</span><span class="cx"> if (iterable.isUndefinedOrNull())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeNativeErrorConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp (196965 => 196966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp 2016-02-23 00:48:48 UTC (rev 196965)
+++ trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp 2016-02-23 00:51:02 UTC (rev 196966)
</span><span class="lines">@@ -64,6 +64,8 @@
</span><span class="cx"> {
</span><span class="cx"> JSValue message = exec->argument(0);
</span><span class="cx"> Structure* errorStructure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), jsCast<NativeErrorConstructor*>(exec->callee())->errorStructure());
</span><ins>+ if (exec->hadException())
+ return JSValue::encode(JSValue());
</ins><span class="cx"> ASSERT(errorStructure);
</span><span class="cx"> return JSValue::encode(ErrorInstance::create(exec, errorStructure, message, nullptr, TypeNothing, false));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeNumberConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp (196965 => 196966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp 2016-02-23 00:48:48 UTC (rev 196965)
+++ trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp 2016-02-23 00:51:02 UTC (rev 196966)
</span><span class="lines">@@ -81,8 +81,11 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL constructWithNumberConstructor(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> double n = exec->argumentCount() ? exec->uncheckedArgument(0).toNumber(exec) : 0;
</span><del>- NumberObject* object = NumberObject::create(exec->vm(), InternalFunction::createSubclassStructure(exec, exec->newTarget(), asInternalFunction(exec->callee())->globalObject()->numberObjectStructure()));
</del><ins>+ Structure* structure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), exec->lexicalGlobalObject()->numberObjectStructure());
+ if (exec->hadException())
+ return JSValue::encode(JSValue());
</ins><span class="cx">
</span><ins>+ NumberObject* object = NumberObject::create(exec->vm(), structure);
</ins><span class="cx"> object->setInternalValue(exec->vm(), jsNumber(n));
</span><span class="cx"> return JSValue::encode(object);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExpConstructor.cpp (196965 => 196966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpConstructor.cpp 2016-02-23 00:48:48 UTC (rev 196965)
+++ trunk/Source/JavaScriptCore/runtime/RegExpConstructor.cpp 2016-02-23 00:51:02 UTC (rev 196966)
</span><span class="lines">@@ -249,9 +249,8 @@
</span><span class="cx"> inline Structure* getRegExpStructure(ExecState* exec, JSGlobalObject* globalObject, JSValue newTarget)
</span><span class="cx"> {
</span><span class="cx"> Structure* structure = globalObject->regExpStructure();
</span><del>- if (newTarget != jsUndefined()) {
</del><ins>+ if (newTarget != jsUndefined())
</ins><span class="cx"> structure = InternalFunction::createSubclassStructure(exec, newTarget, structure);
</span><del>- }
</del><span class="cx"> return structure;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -267,8 +266,11 @@
</span><span class="cx"> // If called as a function, this just returns the first argument (see 15.10.3.1).
</span><span class="cx"> if (newTarget != jsUndefined()) {
</span><span class="cx"> RegExp* regExp = static_cast<RegExpObject*>(asObject(arg0))->regExp();
</span><ins>+ Structure* structure = getRegExpStructure(exec, globalObject, newTarget);
+ if (exec->hadException())
+ return nullptr;
</ins><span class="cx">
</span><del>- return RegExpObject::create(exec->vm(), getRegExpStructure(exec, globalObject, newTarget), regExp);
</del><ins>+ return RegExpObject::create(exec->vm(), structure, regExp);
</ins><span class="cx"> }
</span><span class="cx"> return asObject(arg0);
</span><span class="cx"> }
</span><span class="lines">@@ -291,7 +293,10 @@
</span><span class="cx"> if (!regExp->isValid())
</span><span class="cx"> return vm.throwException(exec, createSyntaxError(exec, regExp->errorMessage()));
</span><span class="cx">
</span><del>- return RegExpObject::create(vm, getRegExpStructure(exec, globalObject, newTarget), regExp);
</del><ins>+ Structure* structure = getRegExpStructure(exec, globalObject, newTarget);
+ if (exec->hadException())
+ return nullptr;
+ return RegExpObject::create(vm, structure, regExp);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL constructWithRegExpConstructor(ExecState* exec)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeSetConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/SetConstructor.cpp (196965 => 196966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/SetConstructor.cpp 2016-02-23 00:48:48 UTC (rev 196965)
+++ trunk/Source/JavaScriptCore/runtime/SetConstructor.cpp 2016-02-23 00:51:02 UTC (rev 196966)
</span><span class="lines">@@ -58,6 +58,8 @@
</span><span class="cx"> {
</span><span class="cx"> JSGlobalObject* globalObject = asInternalFunction(exec->callee())->globalObject();
</span><span class="cx"> Structure* setStructure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), globalObject->setStructure());
</span><ins>+ if (exec->hadException())
+ return JSValue::encode(JSValue());
</ins><span class="cx"> JSSet* set = JSSet::create(exec, setStructure);
</span><span class="cx"> JSValue iterable = exec->argument(0);
</span><span class="cx"> if (iterable.isUndefinedOrNull())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringConstructor.cpp (196965 => 196966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringConstructor.cpp 2016-02-23 00:48:48 UTC (rev 196965)
+++ trunk/Source/JavaScriptCore/runtime/StringConstructor.cpp 2016-02-23 00:51:02 UTC (rev 196966)
</span><span class="lines">@@ -125,10 +125,13 @@
</span><span class="cx"> JSGlobalObject* globalObject = asInternalFunction(exec->callee())->globalObject();
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx">
</span><ins>+ Structure* structure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), globalObject->stringObjectStructure());
+ if (exec->hadException())
+ return JSValue::encode(JSValue());
+
</ins><span class="cx"> if (!exec->argumentCount())
</span><del>- return JSValue::encode(StringObject::create(vm, InternalFunction::createSubclassStructure(exec, exec->newTarget(), globalObject->stringObjectStructure())));
-
- return JSValue::encode(StringObject::create(vm, InternalFunction::createSubclassStructure(exec, exec->newTarget(), globalObject->stringObjectStructure()), exec->uncheckedArgument(0).toString(exec)));
</del><ins>+ return JSValue::encode(StringObject::create(vm, structure));
+ return JSValue::encode(StringObject::create(vm, structure, exec->uncheckedArgument(0).toString(exec)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ConstructType StringConstructor::getConstructData(JSCell*, ConstructData& constructData)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWeakMapConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp (196965 => 196966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp 2016-02-23 00:48:48 UTC (rev 196965)
+++ trunk/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp 2016-02-23 00:51:02 UTC (rev 196966)
</span><span class="lines">@@ -55,6 +55,8 @@
</span><span class="cx"> {
</span><span class="cx"> JSGlobalObject* globalObject = asInternalFunction(exec->callee())->globalObject();
</span><span class="cx"> Structure* weakMapStructure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), globalObject->weakMapStructure());
</span><ins>+ if (exec->hadException())
+ return JSValue::encode(JSValue());
</ins><span class="cx"> JSWeakMap* weakMap = JSWeakMap::create(exec, weakMapStructure);
</span><span class="cx"> JSValue iterable = exec->argument(0);
</span><span class="cx"> if (iterable.isUndefinedOrNull())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWeakSetConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp (196965 => 196966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp 2016-02-23 00:48:48 UTC (rev 196965)
+++ trunk/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp 2016-02-23 00:51:02 UTC (rev 196966)
</span><span class="lines">@@ -55,6 +55,8 @@
</span><span class="cx"> {
</span><span class="cx"> JSGlobalObject* globalObject = asInternalFunction(exec->callee())->globalObject();
</span><span class="cx"> Structure* weakSetStructure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), globalObject->weakSetStructure());
</span><ins>+ if (exec->hadException())
+ return JSValue::encode(JSValue());
</ins><span class="cx"> JSWeakSet* weakSet = JSWeakSet::create(exec, weakSetStructure);
</span><span class="cx"> JSValue iterable = exec->argument(0);
</span><span class="cx"> if (iterable.isUndefinedOrNull())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresscreatesubclassstructuremightthrowjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/create-subclass-structure-might-throw.js (0 => 196966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/create-subclass-structure-might-throw.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/create-subclass-structure-might-throw.js 2016-02-23 00:51:02 UTC (rev 196966)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+function assert(b) {
+ if (!b)
+ throw new Error("bad assertion.");
+}
+
+let targets = [Function, String, Array, Set, Map, WeakSet, WeakMap, RegExp, Number, Promise, Date, Boolean, Error, TypeError, SyntaxError, ArrayBuffer, Int32Array, Int8Array, Uint8Array, Uint8ClampedArray, Int16Array, Uint16Array, Uint32Array, Float32Array, Float64Array, DataView];
+for (let target of targets) {
+ let error = null;
+ let called = false;
+ let handler = {
+ get: function(theTarget, propName) {
+ assert(propName === "prototype");
+ error = new Error;
+ called = true;
+ throw error;
+ }
+ };
+
+ let proxy = new Proxy(target, handler);
+
+ for (let i = 0; i < 500; i++) {
+ let threw = false;
+ try {
+ new proxy;
+ } catch(e) {
+ threw = true;
+ assert(e === error);
+ error = null;
+ }
+ assert(threw);
+ assert(called);
+ called = false;
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>