Incorporate MissingDealloc_IBOutlet.m test case into MissingDealloc.m

llvm-svn: 60722

2 files changed, 18 insertions, 20 deletions

diff --git a/clang/test/Analysis/MissingDealloc.m b/clang/test/Analysis/MissingDealloc.m
index 62a53047bc8..e6df6f071b8 100644
--- a/clang/test/Analysis/MissingDealloc.m
+++ b/clang/test/Analysis/MissingDealloc.m
@@ -45,3 +45,21 @@ typedef struct objc_selector *SEL;
   return self;
 }
 @end
+
+//===------------------------------------------------------------------------===
+//  Don't warn about iVars that are IBOutlets.
+
+#ifndef IBOutlet
+#define IBOutlet
+#endif
+
+@class NSWindow;
+
+@interface HasOutlet : NSObject {
+IBOutlet NSWindow *window;
+}
+@end
+
+@implementation HasOutlet // no-warning
+@end
+
diff --git a/clang/test/Analysis/MissingDealloc_IBOutlet.m b/clang/test/Analysis/MissingDealloc_IBOutlet.m
deleted file mode 100644
index 4049e795547..00000000000
--- a/clang/test/Analysis/MissingDealloc_IBOutlet.m
+++ /dev/null
@@ -1,20 +0,0 @@
-// RUN: clang -warn-objc-missing-dealloc '-DIBOutlet=__attribute__((iboutlet))' %s --verify
-
-#ifndef IBOutlet
-#define IBOutlet
-#endif
-
-@class NSWindow;
-
-@interface NSObject {}
-- (void)dealloc;
-@end
-
-@interface A : NSObject {
-IBOutlet NSWindow *window;
-}
-@end
-
-@implementation A // no-warning
-@end
-