merge another one in.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@94404 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/CodeGenObjC/PR4541.m b/test/CodeGenObjC/PR4541.m
deleted file mode 100644 (file)
index 84218a9..0000000
--- a/test/CodeGenObjC/PR4541.m
+++ /dev/null
@@ -1,19 +0,0 @@
-// RUN: %clang_cc1 -o %t -w  -g %s
-
-
-@class NSString;
-@interface NSAttributedString 
-- (NSString *)string;
-@end 
-@interface NSMutableAttributedString : NSAttributedString 
-@end 
-@class NSImage;
-@implementation CYObjectsController 
-+ (void)initialize {
-}
-+ (NSAttributedString *)attributedStringWithString:(id)string image:(NSImage *)image  {
-  NSMutableAttributedString *attrStr;
-}
-@end
-
-

diff --git a/test/CodeGenObjC/debug-info-crash.m b/test/CodeGenObjC/debug-info-crash.m
index 1126ef0c36738d5fdc65c507dda3e874f9188e27..92f9c0eda3165d7c829510c0f82bd62630936a4f 100644 (file)
--- a/test/CodeGenObjC/debug-info-crash.m
+++ b/test/CodeGenObjC/debug-info-crash.m
@@ -22,3 +22,19 @@
   return 0;
 }
 @end
+
+// PR4541
+@class NSString;
+@interface NSAttributedString 
+- (NSString *)string;
+@end 
+@interface NSMutableAttributedString : NSAttributedString 
+@end 
+@class NSImage;
+@implementation CYObjectsController 
++ (void)initialize {
+}
++ (NSAttributedString *)attributedStringWithString:(id)string image:(NSImage *)image  {
+  NSMutableAttributedString *attrStr;
+}
+@end