<!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>[203320] 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/203320">203320</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-15 21:16:30 -0700 (Fri, 15 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Convert the remaining createOutOfMemoryError()+throwException() into throwOutOfMemoryError()
https://bugs.webkit.org/show_bug.cgi?id=159665
Patch by Benjamin Poulain <bpoulain@apple.com> on 2016-07-15
Reviewed by Saam Barati.
* API/JSTypedArray.cpp:
(createTypedArray):
* runtime/Error.cpp:
(JSC::createOutOfMemoryError):
* runtime/Error.h:
* runtime/ExceptionHelpers.cpp:
(JSC::throwOutOfMemoryError):
* runtime/JSArrayBufferConstructor.cpp:
(JSC::constructArrayBuffer):
* runtime/JSArrayBufferPrototype.cpp:
(JSC::arrayBufferProtoFuncSlice):
* runtime/JSGenericTypedArrayViewInlines.h:
(JSC::JSGenericTypedArrayView<Adaptor>::create):
(JSC::JSGenericTypedArrayView<Adaptor>::createUninitialized):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSTypedArraycpp">trunk/Source/JavaScriptCore/API/JSTypedArray.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeErrorcpp">trunk/Source/JavaScriptCore/runtime/Error.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeErrorh">trunk/Source/JavaScriptCore/runtime/Error.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSArrayBufferConstructorcpp">trunk/Source/JavaScriptCore/runtime/JSArrayBufferConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSArrayBufferPrototypecpp">trunk/Source/JavaScriptCore/runtime/JSArrayBufferPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewInlinesh">trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSTypedArraycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSTypedArray.cpp (203319 => 203320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSTypedArray.cpp 2016-07-16 02:50:12 UTC (rev 203319)
+++ trunk/Source/JavaScriptCore/API/JSTypedArray.cpp 2016-07-16 04:16:30 UTC (rev 203320)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSGlobalObject* globalObject = exec->lexicalGlobalObject();
</span><span class="cx"> if (!buffer) {
</span><del>- exec->vm().throwException(exec, createOutOfMemoryError(exec));
</del><ins>+ throwOutOfMemoryError(exec);
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> switch (type) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (203319 => 203320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-07-16 02:50:12 UTC (rev 203319)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-07-16 04:16:30 UTC (rev 203320)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2016-07-15 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><ins>+ [JSC] Convert the remaining createOutOfMemoryError()+throwException() into throwOutOfMemoryError()
+ https://bugs.webkit.org/show_bug.cgi?id=159665
+
+ Reviewed by Saam Barati.
+
+ * API/JSTypedArray.cpp:
+ (createTypedArray):
+ * runtime/Error.cpp:
+ (JSC::createOutOfMemoryError):
+ * runtime/Error.h:
+ * runtime/ExceptionHelpers.cpp:
+ (JSC::throwOutOfMemoryError):
+ * runtime/JSArrayBufferConstructor.cpp:
+ (JSC::constructArrayBuffer):
+ * runtime/JSArrayBufferPrototype.cpp:
+ (JSC::arrayBufferProtoFuncSlice):
+ * runtime/JSGenericTypedArrayViewInlines.h:
+ (JSC::JSGenericTypedArrayView<Adaptor>::create):
+ (JSC::JSGenericTypedArrayView<Adaptor>::createUninitialized):
+
+2016-07-15 Benjamin Poulain <bpoulain@apple.com>
+
</ins><span class="cx"> [JSC] Change some parameters based on a random search
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=158514
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeErrorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Error.cpp (203319 => 203320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Error.cpp 2016-07-16 02:50:12 UTC (rev 203319)
+++ trunk/Source/JavaScriptCore/runtime/Error.cpp 2016-07-16 04:16:30 UTC (rev 203320)
</span><span class="lines">@@ -98,12 +98,6 @@
</span><span class="cx"> return ErrorInstance::create(exec, globalObject->vm(), globalObject->URIErrorConstructor()->errorStructure(), message, appender, TypeNothing, true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSObject* createOutOfMemoryError(ExecState* exec, ErrorInstance::SourceAppender appender)
-{
- return createError(exec, ASCIILiteral("Out of memory"), appender);
-}
-
-
</del><span class="cx"> class FindFirstCallerFrameWithCodeblockFunctor {
</span><span class="cx"> public:
</span><span class="cx"> FindFirstCallerFrameWithCodeblockFunctor(CallFrame* startCallFrame)
</span><span class="lines">@@ -283,7 +277,7 @@
</span><span class="cx">
</span><span class="cx"> JSObject* createOutOfMemoryError(ExecState* exec)
</span><span class="cx"> {
</span><del>- return createOutOfMemoryError(exec, nullptr);
</del><ins>+ return createError(exec, ASCIILiteral("Out of memory"), nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Error.h (203319 => 203320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Error.h 2016-07-16 02:50:12 UTC (rev 203319)
+++ trunk/Source/JavaScriptCore/runtime/Error.h 2016-07-16 04:16:30 UTC (rev 203320)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx"> JSObject* createTypeError(ExecState*, const String&, ErrorInstance::SourceAppender, RuntimeType);
</span><span class="cx"> JSObject* createNotEnoughArgumentsError(ExecState*, ErrorInstance::SourceAppender);
</span><span class="cx"> JSObject* createURIError(ExecState*, const String&, ErrorInstance::SourceAppender);
</span><del>-JSObject* createOutOfMemoryError(ExecState*, ErrorInstance::SourceAppender);
</del><span class="cx">
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE JSObject* createError(ExecState*, const String&);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSArrayBufferConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSArrayBufferConstructor.cpp (203319 => 203320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSArrayBufferConstructor.cpp 2016-07-16 02:50:12 UTC (rev 203319)
+++ trunk/Source/JavaScriptCore/runtime/JSArrayBufferConstructor.cpp 2016-07-16 04:16:30 UTC (rev 203320)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx">
</span><span class="cx"> auto buffer = ArrayBuffer::tryCreate(length, 1);
</span><span class="cx"> if (!buffer)
</span><del>- return throwVMError(exec, createOutOfMemoryError(exec));
</del><ins>+ return JSValue::encode(throwOutOfMemoryError(exec));
</ins><span class="cx">
</span><span class="cx"> Structure* arrayBufferStructure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), constructor->globalObject()->arrayBufferStructure());
</span><span class="cx"> if (exec->hadException())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSArrayBufferPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSArrayBufferPrototype.cpp (203319 => 203320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSArrayBufferPrototype.cpp 2016-07-16 02:50:12 UTC (rev 203319)
+++ trunk/Source/JavaScriptCore/runtime/JSArrayBufferPrototype.cpp 2016-07-16 04:16:30 UTC (rev 203320)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<ArrayBuffer> newBuffer = thisObject->impl()->slice(begin, end);
</span><span class="cx"> if (!newBuffer)
</span><del>- return throwVMError(exec, createOutOfMemoryError(exec));
</del><ins>+ return JSValue::encode(throwOutOfMemoryError(exec));
</ins><span class="cx">
</span><span class="cx"> Structure* structure = callee->globalObject()->arrayBufferStructure();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h (203319 => 203320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h 2016-07-16 02:50:12 UTC (rev 203319)
+++ trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h 2016-07-16 04:16:30 UTC (rev 203320)
</span><span class="lines">@@ -50,8 +50,8 @@
</span><span class="cx"> {
</span><span class="cx"> ConstructionContext context(exec->vm(), structure, length, sizeof(typename Adaptor::Type));
</span><span class="cx"> if (!context) {
</span><del>- exec->vm().throwException(exec, createOutOfMemoryError(exec));
- return 0;
</del><ins>+ throwOutOfMemoryError(exec);
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> JSGenericTypedArrayView* result =
</span><span class="cx"> new (NotNull, allocateCell<JSGenericTypedArrayView>(exec->vm().heap))
</span><span class="lines">@@ -68,8 +68,8 @@
</span><span class="cx"> exec->vm(), structure, length, sizeof(typename Adaptor::Type),
</span><span class="cx"> ConstructionContext::DontInitialize);
</span><span class="cx"> if (!context) {
</span><del>- exec->vm().throwException(exec, createOutOfMemoryError(exec));
- return 0;
</del><ins>+ throwOutOfMemoryError(exec);
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> JSGenericTypedArrayView* result =
</span><span class="cx"> new (NotNull, allocateCell<JSGenericTypedArrayView>(exec->vm().heap))
</span></span></pre>
</div>
</div>
</body>
</html>