<!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>[164136] 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/164136">164136</a></dd>
<dt>Author</dt> <dd>mhahnenberg@apple.com</dd>
<dt>Date</dt> <dd>2014-02-14 14:44:52 -0800 (Fri, 14 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERT(isValidAllocation(bytes)) when ObjC API creates custom errors
https://bugs.webkit.org/show_bug.cgi?id=128840
Reviewed by Joseph Pecoraro.
We need to add APIEntryShims around places where we allocate errors in JSC.
Also converted some of the createTypeError call sites to use ASCIILiteral.
* API/JSValue.mm:
(valueToArray):
(valueToDictionary):
* API/ObjCCallbackFunction.mm:
(JSC::objCCallbackFunctionCallAsConstructor):
(JSC::ObjCCallbackFunctionImpl::call):
* API/tests/testapi.mm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSValuemm">trunk/Source/JavaScriptCore/API/JSValue.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIObjCCallbackFunctionmm">trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIteststestapimm">trunk/Source/JavaScriptCore/API/tests/testapi.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSValuemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSValue.mm (164135 => 164136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSValue.mm 2014-02-14 22:30:18 UTC (rev 164135)
+++ trunk/Source/JavaScriptCore/API/JSValue.mm 2014-02-14 22:44:52 UTC (rev 164136)
</span><span class="lines">@@ -780,8 +780,9 @@
</span><span class="cx"> if (JSValueIsObject(context, value))
</span><span class="cx"> return containerValueToObject(context, (JSContainerConvertor::Task){ value, [NSMutableArray array], ContainerArray});
</span><span class="cx">
</span><ins>+ JSC::APIEntryShim shim(toJS(context));
</ins><span class="cx"> if (!(JSValueIsNull(context, value) || JSValueIsUndefined(context, value)))
</span><del>- *exception = toRef(JSC::createTypeError(toJS(context), "Cannot convert primitive to NSArray"));
</del><ins>+ *exception = toRef(JSC::createTypeError(toJS(context), ASCIILiteral("Cannot convert primitive to NSArray")));
</ins><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -796,8 +797,9 @@
</span><span class="cx"> if (JSValueIsObject(context, value))
</span><span class="cx"> return containerValueToObject(context, (JSContainerConvertor::Task){ value, [NSMutableDictionary dictionary], ContainerDictionary});
</span><span class="cx">
</span><ins>+ JSC::APIEntryShim shim(toJS(context));
</ins><span class="cx"> if (!(JSValueIsNull(context, value) || JSValueIsUndefined(context, value)))
</span><del>- *exception = toRef(JSC::createTypeError(toJS(context), "Cannot convert primitive to NSDictionary"));
</del><ins>+ *exception = toRef(JSC::createTypeError(toJS(context), ASCIILiteral("Cannot convert primitive to NSDictionary")));
</ins><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIObjCCallbackFunctionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm (164135 => 164136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm 2014-02-14 22:30:18 UTC (rev 164135)
+++ trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm 2014-02-14 22:44:52 UTC (rev 164136)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- *exception = toRef(JSC::createTypeError(toJS(contextRef), "Argument does not match Objective-C Class"));
</del><ins>+ *exception = toRef(JSC::createTypeError(toJS(contextRef), ASCIILiteral("Argument does not match Objective-C Class")));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Class m_class;
</span><span class="lines">@@ -496,7 +496,7 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> if (!JSValueIsObject(contextRef, result)) {
</span><del>- *exception = toRef(JSC::createTypeError(toJS(contextRef), "Objective-C blocks called as constructors must return an object."));
</del><ins>+ *exception = toRef(JSC::createTypeError(toJS(contextRef), ASCIILiteral("Objective-C blocks called as constructors must return an object.")));
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> return (JSObjectRef)result;
</span><span class="lines">@@ -562,7 +562,7 @@
</span><span class="cx"> RELEASE_ASSERT(!thisObject);
</span><span class="cx"> target = [m_instanceClass alloc];
</span><span class="cx"> if (!target || ![target isKindOfClass:m_instanceClass]) {
</span><del>- *exception = toRef(JSC::createTypeError(toJS(contextRef), "self type check failed for Objective-C instance method"));
</del><ins>+ *exception = toRef(JSC::createTypeError(toJS(contextRef), ASCIILiteral("self type check failed for Objective-C instance method")));
</ins><span class="cx"> return JSValueMakeUndefined(contextRef);
</span><span class="cx"> }
</span><span class="cx"> [m_invocation setTarget:target];
</span><span class="lines">@@ -572,7 +572,7 @@
</span><span class="cx"> case CallbackInstanceMethod: {
</span><span class="cx"> target = tryUnwrapObjcObject(contextRef, thisObject);
</span><span class="cx"> if (!target || ![target isKindOfClass:m_instanceClass]) {
</span><del>- *exception = toRef(JSC::createTypeError(toJS(contextRef), "self type check failed for Objective-C instance method"));
</del><ins>+ *exception = toRef(JSC::createTypeError(toJS(contextRef), ASCIILiteral("self type check failed for Objective-C instance method")));
</ins><span class="cx"> return JSValueMakeUndefined(contextRef);
</span><span class="cx"> }
</span><span class="cx"> [m_invocation setTarget:target];
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIteststestapimm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/tests/testapi.mm (164135 => 164136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/tests/testapi.mm 2014-02-14 22:30:18 UTC (rev 164135)
+++ trunk/Source/JavaScriptCore/API/tests/testapi.mm 2014-02-14 22:44:52 UTC (rev 164136)
</span><span class="lines">@@ -1272,6 +1272,12 @@
</span><span class="cx"> checkResult(@"makeObject() instanceof UnexportedObject", [result isBoolean] && [result toBool]);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ @autoreleasepool {
+ JSContext *context = [[JSContext alloc] init];
+ [[JSValue valueWithInt32:42 inContext:context] toDictionary];
+ [[JSValue valueWithInt32:42 inContext:context] toArray];
+ }
+
</ins><span class="cx"> currentThisInsideBlockGetterTest();
</span><span class="cx"> runDateTests();
</span><span class="cx"> runJSExportTests();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (164135 => 164136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-14 22:30:18 UTC (rev 164135)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-14 22:44:52 UTC (rev 164136)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-02-14 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><ins>+ ASSERT(isValidAllocation(bytes)) when ObjC API creates custom errors
+ https://bugs.webkit.org/show_bug.cgi?id=128840
+
+ Reviewed by Joseph Pecoraro.
+
+ We need to add APIEntryShims around places where we allocate errors in JSC.
+ Also converted some of the createTypeError call sites to use ASCIILiteral.
+
+ * API/JSValue.mm:
+ (valueToArray):
+ (valueToDictionary):
+ * API/ObjCCallbackFunction.mm:
+ (JSC::objCCallbackFunctionCallAsConstructor):
+ (JSC::ObjCCallbackFunctionImpl::call):
+ * API/tests/testapi.mm:
+
+2014-02-14 Mark Hahnenberg <mhahnenberg@apple.com>
+
</ins><span class="cx"> Baseline JIT should have a fast path to bypass the write barrier on op_enter
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=128832
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>