<!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>[198257] 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/198257">198257</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2016-03-15 20:31:35 -0700 (Tue, 15 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/198077">r198077</a>): generated Objective-C protocol object getters leak their wrappers
https://bugs.webkit.org/show_bug.cgi?id=155523
<rdar://problem/25181764>
Reviewed by Joseph Pecoraro.
Since the code may not be compiled with ARC, autorelease the returned wrapper.
* inspector/scripts/codegen/objc_generator.py:
(ObjCGenerator.protocol_to_objc_expression_for_member):
* inspector/scripts/tests/expected/type-declaration-object-type.json-result:
* inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegenobjc_generatorpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationobjecttypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtyperequiringruntimecastsjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (198256 => 198257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-16 02:16:40 UTC (rev 198256)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-16 03:31:35 UTC (rev 198257)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-03-15 Brian Burg <bburg@apple.com>
+
+ REGRESSION(r198077): generated Objective-C protocol object getters leak their wrappers
+ https://bugs.webkit.org/show_bug.cgi?id=155523
+ <rdar://problem/25181764>
+
+ Reviewed by Joseph Pecoraro.
+
+ Since the code may not be compiled with ARC, autorelease the returned wrapper.
+
+ * inspector/scripts/codegen/objc_generator.py:
+ (ObjCGenerator.protocol_to_objc_expression_for_member):
+ * inspector/scripts/tests/expected/type-declaration-object-type.json-result:
+ * inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:
+
</ins><span class="cx"> 2016-03-15 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Help clang generate better code on arrayProtoFuncToString()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegenobjc_generatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py (198256 => 198257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py 2016-03-16 02:16:40 UTC (rev 198256)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py 2016-03-16 03:31:35 UTC (rev 198257)
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx"> return sub_expression
</span><span class="cx"> if category is ObjCTypeCategory.Object:
</span><span class="cx"> objc_class = self.objc_class_for_type(member.type)
</span><del>- return '[[%s alloc] initWithInspectorObject:[%s toInspectorObject].get()]' % (objc_class, sub_expression)
</del><ins>+ return '[[[%s alloc] initWithInspectorObject:[%s toInspectorObject].get()] autorelease]' % (objc_class, sub_expression)
</ins><span class="cx"> if category is ObjCTypeCategory.Array:
</span><span class="cx"> protocol_type = ObjCGenerator.protocol_type_for_type(member.type.element_type)
</span><span class="cx"> objc_class = self.objc_class_for_type(member.type.element_type)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationobjecttypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result (198256 => 198257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-03-16 02:16:40 UTC (rev 198256)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-03-16 03:31:35 UTC (rev 198257)
</span><span class="lines">@@ -1595,7 +1595,7 @@
</span><span class="cx">
</span><span class="cx"> - (RWIProtocolJSONObject *)values
</span><span class="cx"> {
</span><del>- return [[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"values"] toInspectorObject].get()];
</del><ins>+ return [[[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"values"] toInspectorObject].get()] autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setPayload:(RWIProtocolJSONObject *)payload
</span><span class="lines">@@ -1605,7 +1605,7 @@
</span><span class="cx">
</span><span class="cx"> - (RWIProtocolJSONObject *)payload
</span><span class="cx"> {
</span><del>- return [[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"payload"] toInspectorObject].get()];
</del><ins>+ return [[[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"payload"] toInspectorObject].get()] autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setError:(TestProtocolDatabaseError *)error
</span><span class="lines">@@ -1615,7 +1615,7 @@
</span><span class="cx">
</span><span class="cx"> - (TestProtocolDatabaseError *)error
</span><span class="cx"> {
</span><del>- return [[TestProtocolDatabaseError alloc] initWithInspectorObject:[[super objectForKey:@"error"] toInspectorObject].get()];
</del><ins>+ return [[[TestProtocolDatabaseError alloc] initWithInspectorObject:[[super objectForKey:@"error"] toInspectorObject].get()] autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setErrorList:(NSArray/*<TestProtocolDatabaseError>*/ *)errorList
</span><span class="lines">@@ -1730,7 +1730,7 @@
</span><span class="cx">
</span><span class="cx"> - (RWIProtocolJSONObject *)values
</span><span class="cx"> {
</span><del>- return [[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"values"] toInspectorObject].get()];
</del><ins>+ return [[[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"values"] toInspectorObject].get()] autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setPayload:(RWIProtocolJSONObject *)payload
</span><span class="lines">@@ -1740,7 +1740,7 @@
</span><span class="cx">
</span><span class="cx"> - (RWIProtocolJSONObject *)payload
</span><span class="cx"> {
</span><del>- return [[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"payload"] toInspectorObject].get()];
</del><ins>+ return [[[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"payload"] toInspectorObject].get()] autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setError:(TestProtocolDatabaseError *)error
</span><span class="lines">@@ -1750,7 +1750,7 @@
</span><span class="cx">
</span><span class="cx"> - (TestProtocolDatabaseError *)error
</span><span class="cx"> {
</span><del>- return [[TestProtocolDatabaseError alloc] initWithInspectorObject:[[super objectForKey:@"error"] toInspectorObject].get()];
</del><ins>+ return [[[TestProtocolDatabaseError alloc] initWithInspectorObject:[[super objectForKey:@"error"] toInspectorObject].get()] autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setErrorList:(NSArray/*<TestProtocolDatabaseError>*/ *)errorList
</span><span class="lines">@@ -1983,7 +1983,7 @@
</span><span class="cx">
</span><span class="cx"> - (RWIProtocolJSONObject *)values
</span><span class="cx"> {
</span><del>- return [[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"values"] toInspectorObject].get()];
</del><ins>+ return [[[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"values"] toInspectorObject].get()] autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setPayload:(RWIProtocolJSONObject *)payload
</span><span class="lines">@@ -1993,7 +1993,7 @@
</span><span class="cx">
</span><span class="cx"> - (RWIProtocolJSONObject *)payload
</span><span class="cx"> {
</span><del>- return [[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"payload"] toInspectorObject].get()];
</del><ins>+ return [[[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"payload"] toInspectorObject].get()] autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setError:(TestProtocolDatabaseError *)error
</span><span class="lines">@@ -2003,7 +2003,7 @@
</span><span class="cx">
</span><span class="cx"> - (TestProtocolDatabaseError *)error
</span><span class="cx"> {
</span><del>- return [[TestProtocolDatabaseError alloc] initWithInspectorObject:[[super objectForKey:@"error"] toInspectorObject].get()];
</del><ins>+ return [[[TestProtocolDatabaseError alloc] initWithInspectorObject:[[super objectForKey:@"error"] toInspectorObject].get()] autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtyperequiringruntimecastsjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result (198256 => 198257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-03-16 02:16:40 UTC (rev 198256)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-03-16 03:31:35 UTC (rev 198257)
</span><span class="lines">@@ -1473,7 +1473,7 @@
</span><span class="cx">
</span><span class="cx"> - (TestProtocolTestRecursiveObject1 *)tree
</span><span class="cx"> {
</span><del>- return [[TestProtocolTestRecursiveObject1 alloc] initWithInspectorObject:[[super objectForKey:@"tree"] toInspectorObject].get()];
</del><ins>+ return [[[TestProtocolTestRecursiveObject1 alloc] initWithInspectorObject:[[super objectForKey:@"tree"] toInspectorObject].get()] autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="lines">@@ -1504,7 +1504,7 @@
</span><span class="cx">
</span><span class="cx"> - (TestProtocolTestRecursiveObject2 *)obj
</span><span class="cx"> {
</span><del>- return [[TestProtocolTestRecursiveObject2 alloc] initWithInspectorObject:[[super objectForKey:@"obj"] toInspectorObject].get()];
</del><ins>+ return [[[TestProtocolTestRecursiveObject2 alloc] initWithInspectorObject:[[super objectForKey:@"obj"] toInspectorObject].get()] autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="lines">@@ -1535,7 +1535,7 @@
</span><span class="cx">
</span><span class="cx"> - (TestProtocolTestRecursiveObject1 *)obj
</span><span class="cx"> {
</span><del>- return [[TestProtocolTestRecursiveObject1 alloc] initWithInspectorObject:[[super objectForKey:@"obj"] toInspectorObject].get()];
</del><ins>+ return [[[TestProtocolTestRecursiveObject1 alloc] initWithInspectorObject:[[super objectForKey:@"obj"] toInspectorObject].get()] autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre>
</div>
</div>
</body>
</html>