diff options
| -rw-r--r-- | lib/Analysis/CFRefCount.cpp | 6 | ||||
| -rw-r--r-- | test/Analysis/NSWindow.m | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp index 0d5752d55b..3816c560b3 100644 --- a/lib/Analysis/CFRefCount.cpp +++ b/lib/Analysis/CFRefCount.cpp @@ -1130,8 +1130,12 @@ void RetainSummaryManager::InitializeMethodSummaries() { addNSObjectMethSummary(GetNullarySelector("autorelease", Ctx), Summ); // For NSWindow, allocated objects are (initially) self-owned. + // FIXME: For now we opt for false negatives with NSWindow, as these objects + // self-own themselves. However, they only do this once they are displayed. + // Thus, we need to track an NSWindow's display status. + // This is tracked in <rdar://problem/6062711>. RetainSummary *NSWindowSumm = - getPersistentSummary(RetEffect::MakeReceiverAlias(), SelfOwn); + getPersistentSummary(RetEffect::MakeReceiverAlias(), StopTracking); addInstMethSummary("NSWindow", NSWindowSumm, "initWithContentRect", "styleMask", "backing", "defer", NULL); diff --git a/test/Analysis/NSWindow.m b/test/Analysis/NSWindow.m index 93ab871e16..4cab918f50 100644 --- a/test/Analysis/NSWindow.m +++ b/test/Analysis/NSWindow.m @@ -69,7 +69,8 @@ void f2() { } void f2b() { - NSWindow *window = [[NSWindow alloc] // expected-warning{{leak}} + // FIXME: NSWindow doesn't own itself until it is displayed. + NSWindow *window = [[NSWindow alloc] // no-warning initWithContentRect:NSMakeRect(0,0,100,100) styleMask:NSTitledWindowMask|NSClosableWindowMask backing:NSBackingStoreBuffered |