Fix two thinkos and add a test for importing the AST of a category

implementation.

llvm-svn: 121263

2 files changed, 28 insertions, 0 deletions

diff --git a/clang/test/ASTMerge/Inputs/category1.m b/clang/test/ASTMerge/Inputs/category1.m
index 6d4fd8d9f28..afcaab81f2b 100644
--- a/clang/test/ASTMerge/Inputs/category1.m
+++ b/clang/test/ASTMerge/Inputs/category1.m
@@ -28,7 +28,21 @@
 @interface I2 (Cat3)
 @end
 
+@implementation I2 (Cat3)
+@end
+
 // Category with implementation
 @interface I2 (Cat4)
 @end
 
+@implementation I2 (Cat4)
+@end
+
+// Category with mismatched implementation
+@interface I2 (Cat6)
+@end
+
+@implementation I2 (Cat6)
+- (float)blah { return 0; }
+@end
+
diff --git a/clang/test/ASTMerge/Inputs/category2.m b/clang/test/ASTMerge/Inputs/category2.m
index 646ebb557ab..49a3c270a1c 100644
--- a/clang/test/ASTMerge/Inputs/category2.m
+++ b/clang/test/ASTMerge/Inputs/category2.m
@@ -30,6 +30,20 @@ typedef int Int;
 @interface I2 (Cat3)
 @end
 
+@implementation I2 (Cat3)
+@end
+
 // Category with implementation
 @interface I2 (Cat5)
 @end
+
+@implementation I2 (Cat5)
+@end
+
+// Category with mismatched implementation
+@interface I2 (Cat6)
+@end
+
+@implementation I2 (Cat6)
+- (int)blah { return 0; }
+@end