Title: [198257] trunk/Source/_javascript_Core
- Revision
- 198257
- Author
- [email protected]
- Date
- 2016-03-15 20:31:35 -0700 (Tue, 15 Mar 2016)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (198256 => 198257)
--- trunk/Source/_javascript_Core/ChangeLog 2016-03-16 02:16:40 UTC (rev 198256)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-03-16 03:31:35 UTC (rev 198257)
@@ -1,3 +1,18 @@
+2016-03-15 Brian Burg <[email protected]>
+
+ 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:
+
2016-03-15 Benjamin Poulain <[email protected]>
[JSC] Help clang generate better code on arrayProtoFuncToString()
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator.py (198256 => 198257)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator.py 2016-03-16 02:16:40 UTC (rev 198256)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator.py 2016-03-16 03:31:35 UTC (rev 198257)
@@ -444,7 +444,7 @@
return sub_expression
if category is ObjCTypeCategory.Object:
objc_class = self.objc_class_for_type(member.type)
- return '[[%s alloc] initWithInspectorObject:[%s toInspectorObject].get()]' % (objc_class, sub_expression)
+ return '[[[%s alloc] initWithInspectorObject:[%s toInspectorObject].get()] autorelease]' % (objc_class, sub_expression)
if category is ObjCTypeCategory.Array:
protocol_type = ObjCGenerator.protocol_type_for_type(member.type.element_type)
objc_class = self.objc_class_for_type(member.type.element_type)
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result (198256 => 198257)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-03-16 02:16:40 UTC (rev 198256)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-03-16 03:31:35 UTC (rev 198257)
@@ -1595,7 +1595,7 @@
- (RWIProtocolJSONObject *)values
{
- return [[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"values"] toInspectorObject].get()];
+ return [[[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"values"] toInspectorObject].get()] autorelease];
}
- (void)setPayload:(RWIProtocolJSONObject *)payload
@@ -1605,7 +1605,7 @@
- (RWIProtocolJSONObject *)payload
{
- return [[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"payload"] toInspectorObject].get()];
+ return [[[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"payload"] toInspectorObject].get()] autorelease];
}
- (void)setError:(TestProtocolDatabaseError *)error
@@ -1615,7 +1615,7 @@
- (TestProtocolDatabaseError *)error
{
- return [[TestProtocolDatabaseError alloc] initWithInspectorObject:[[super objectForKey:@"error"] toInspectorObject].get()];
+ return [[[TestProtocolDatabaseError alloc] initWithInspectorObject:[[super objectForKey:@"error"] toInspectorObject].get()] autorelease];
}
- (void)setErrorList:(NSArray/*<TestProtocolDatabaseError>*/ *)errorList
@@ -1730,7 +1730,7 @@
- (RWIProtocolJSONObject *)values
{
- return [[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"values"] toInspectorObject].get()];
+ return [[[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"values"] toInspectorObject].get()] autorelease];
}
- (void)setPayload:(RWIProtocolJSONObject *)payload
@@ -1740,7 +1740,7 @@
- (RWIProtocolJSONObject *)payload
{
- return [[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"payload"] toInspectorObject].get()];
+ return [[[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"payload"] toInspectorObject].get()] autorelease];
}
- (void)setError:(TestProtocolDatabaseError *)error
@@ -1750,7 +1750,7 @@
- (TestProtocolDatabaseError *)error
{
- return [[TestProtocolDatabaseError alloc] initWithInspectorObject:[[super objectForKey:@"error"] toInspectorObject].get()];
+ return [[[TestProtocolDatabaseError alloc] initWithInspectorObject:[[super objectForKey:@"error"] toInspectorObject].get()] autorelease];
}
- (void)setErrorList:(NSArray/*<TestProtocolDatabaseError>*/ *)errorList
@@ -1983,7 +1983,7 @@
- (RWIProtocolJSONObject *)values
{
- return [[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"values"] toInspectorObject].get()];
+ return [[[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"values"] toInspectorObject].get()] autorelease];
}
- (void)setPayload:(RWIProtocolJSONObject *)payload
@@ -1993,7 +1993,7 @@
- (RWIProtocolJSONObject *)payload
{
- return [[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"payload"] toInspectorObject].get()];
+ return [[[RWIProtocolJSONObject alloc] initWithInspectorObject:[[super objectForKey:@"payload"] toInspectorObject].get()] autorelease];
}
- (void)setError:(TestProtocolDatabaseError *)error
@@ -2003,7 +2003,7 @@
- (TestProtocolDatabaseError *)error
{
- return [[TestProtocolDatabaseError alloc] initWithInspectorObject:[[super objectForKey:@"error"] toInspectorObject].get()];
+ return [[[TestProtocolDatabaseError alloc] initWithInspectorObject:[[super objectForKey:@"error"] toInspectorObject].get()] autorelease];
}
@end
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result (198256 => 198257)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-03-16 02:16:40 UTC (rev 198256)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-03-16 03:31:35 UTC (rev 198257)
@@ -1473,7 +1473,7 @@
- (TestProtocolTestRecursiveObject1 *)tree
{
- return [[TestProtocolTestRecursiveObject1 alloc] initWithInspectorObject:[[super objectForKey:@"tree"] toInspectorObject].get()];
+ return [[[TestProtocolTestRecursiveObject1 alloc] initWithInspectorObject:[[super objectForKey:@"tree"] toInspectorObject].get()] autorelease];
}
@end
@@ -1504,7 +1504,7 @@
- (TestProtocolTestRecursiveObject2 *)obj
{
- return [[TestProtocolTestRecursiveObject2 alloc] initWithInspectorObject:[[super objectForKey:@"obj"] toInspectorObject].get()];
+ return [[[TestProtocolTestRecursiveObject2 alloc] initWithInspectorObject:[[super objectForKey:@"obj"] toInspectorObject].get()] autorelease];
}
@end
@@ -1535,7 +1535,7 @@
- (TestProtocolTestRecursiveObject1 *)obj
{
- return [[TestProtocolTestRecursiveObject1 alloc] initWithInspectorObject:[[super objectForKey:@"obj"] toInspectorObject].get()];
+ return [[[TestProtocolTestRecursiveObject1 alloc] initWithInspectorObject:[[super objectForKey:@"obj"] toInspectorObject].get()] autorelease];
}
@end
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
