Index: test/Analysis/MissingDealloc.m
===================================================================
--- test/Analysis/MissingDealloc.m
+++ test/Analysis/MissingDealloc.m
@@ -17,7 +17,7 @@
 //  assignment through the setter does not perform a release.
 
 @interface MyObject : NSObject {
-  id _myproperty;  
+  id _myproperty;
 }
 @property(assign) id myproperty;
 @end
@@ -25,8 +25,10 @@
 @implementation MyObject
 @synthesize myproperty=_myproperty; // no-warning
 - (void)dealloc {
-  self.myproperty = 0;
-  [super dealloc]; 
+  // Don't claim that myproperty is released since it the property
+  // has the 'assign' attribute.
+  self.myproperty = 0; // no-warning
+  [super dealloc];
 }
 @end
 
@@ -65,27 +67,6 @@
 @end
 
 //===------------------------------------------------------------------------===
-// <rdar://problem/6380411>
-// Was bogus warning: "The '_myproperty' instance variable was not retained by a
-//  synthesized property but was released in 'dealloc'"
-
-@interface MyObject_rdar6380411 : NSObject {
-    id _myproperty;
-}
-@property(assign) id myproperty;
-@end
-
-@implementation MyObject_rdar6380411
-@synthesize myproperty=_myproperty;
-- (void)dealloc {
-    // Don't claim that myproperty is released since it the property
-    // has the 'assign' attribute.
-    self.myproperty = 0; // no-warning
-    [super dealloc];
-}
-@end
-
-//===------------------------------------------------------------------------===
 // PR 3187: http://llvm.org/bugs/show_bug.cgi?id=3187
 // - Disable the missing -dealloc check for classes that subclass SenTestCase