PrintAsObjC: Start printing __null_unspecified where needed.

Fixes rdar://problem/19499467.

Swift SVN r24643
This commit is contained in:
Doug Gregor
2015-01-22 19:26:21 +00:00
parent 83dd7bf854
commit fe5fe16c46
4 changed files with 32 additions and 32 deletions

View File

@@ -96,17 +96,17 @@ class NotObjC {}
// CHECK-NEXT: + (SWIFT_METATYPE(Methods) __nonnull)getSelf;
// CHECK-NEXT: - (Methods * __nullable)maybeGetSelf;
// CHECK-NEXT: + (SWIFT_METATYPE(Methods) __nullable)maybeGetSelf;
// CHECK-NEXT: - (Methods *)uncheckedGetSelf;
// CHECK-NEXT: + (SWIFT_METATYPE(Methods))uncheckedGetSelf;
// CHECK-NEXT: - (Methods * __null_unspecified)uncheckedGetSelf;
// CHECK-NEXT: + (SWIFT_METATYPE(Methods) __null_unspecified)uncheckedGetSelf;
// CHECK-NEXT: - (void)testParens:(NSInteger)a;
// CHECK-NEXT: - (void)testIgnoredParam:(NSInteger)_;
// CHECK-NEXT: - (void)testIgnoredParams:(NSInteger)_ again:(NSInteger)_;
// CHECK-NEXT: - (void)testArrayBridging:(NS_ARRAY(Methods *) __nonnull)a;
// CHECK-NEXT: - (void)testArrayBridging:(NS_ARRAY(Methods * __nonnull) __nonnull)a;
// CHECK-NEXT: - (void)testArrayBridging2:(NSArray * __nonnull)a;
// CHECK-NEXT: - (void)testArrayBridging3:(NS_ARRAY(NSString *) __nonnull)a;
// CHECK-NEXT: - (void)testArrayBridging3:(NS_ARRAY(NSString * __nonnull) __nonnull)a;
// CHECK-NEXT: - (void)testDictionaryBridging:(NSDictionary * __nonnull)a;
// CHECK-NEXT: - (void)testDictionaryBridging2:(NS_DICTIONARY(NSNumber *, Methods *) __nonnull)a;
// CHECK-NEXT: - (void)testDictionaryBridging3:(NS_DICTIONARY(NSString *, NSString *) __nonnull)a;
// CHECK-NEXT: - (void)testDictionaryBridging2:(NS_DICTIONARY(NSNumber * __nonnull, Methods * __nonnull) __nonnull)a;
// CHECK-NEXT: - (void)testDictionaryBridging3:(NS_DICTIONARY(NSString * __nonnull, NSString * __nonnull) __nonnull)a;
// CHECK-NEXT: - (void)testSetBridging:(NSSet * __nonnull)a;
// CHECK-NEXT: - (IBAction)actionMethod:(id __nonnull)_;
// CHECK-NEXT: init
@@ -309,15 +309,15 @@ private class Private : A1 {}
// CHECK-NEXT: @property (nonatomic, weak) id <MyProtocol> __nullable weakProto;
// CHECK-NEXT: @property (nonatomic) CFTypeRef weakCF;
// CHECK-NEXT: @property (nonatomic) CFStringRef weakCFString;
// CHECK-NEXT: @property (nonatomic, weak) IBOutlet id outlet;
// CHECK-NEXT: @property (nonatomic) IBOutlet Properties * typedOutlet;
// CHECK-NEXT: @property (nonatomic, weak) IBOutlet id __null_unspecified outlet;
// CHECK-NEXT: @property (nonatomic) IBOutlet Properties * __null_unspecified typedOutlet;
// CHECK-NEXT: @property (nonatomic, copy) NSString * __nonnull string;
// CHECK-NEXT: @property (nonatomic, copy) NSArray * __nonnull array;
// CHECK-NEXT: @property (nonatomic, copy) NS_DICTIONARY(NSString *, NSString *) __nonnull dictionary;
// CHECK-NEXT: @property (nonatomic, copy) IBOutletCollection(Properties) NS_ARRAY(Properties *) outletCollection;
// CHECK-NEXT: @property (nonatomic, copy) IBOutletCollection(Properties) NS_ARRAY(Properties *) __nullable outletCollectionOptional;
// CHECK-NEXT: @property (nonatomic, copy) NS_DICTIONARY(NSString * __nonnull, NSString * __nonnull) __nonnull dictionary;
// CHECK-NEXT: @property (nonatomic, copy) IBOutletCollection(Properties) NS_ARRAY(Properties * __nonnull) __null_unspecified outletCollection;
// CHECK-NEXT: @property (nonatomic, copy) IBOutletCollection(Properties) NS_ARRAY(Properties * __nonnull) __nullable outletCollectionOptional;
// CHECK-NEXT: @property (nonatomic, copy) IBOutletCollection(id) NSArray * __nullable outletCollectionAnyObject;
// CHECK-NEXT: @property (nonatomic, copy) IBOutletCollection(id) NS_ARRAY(id <NSObject>) __nullable outletCollectionProto;
// CHECK-NEXT: @property (nonatomic, copy) IBOutletCollection(id) NS_ARRAY(id <NSObject> __nonnull) __nullable outletCollectionProto;
// CHECK-NEXT: init
// CHECK-NEXT: @end
@objc class Properties {
@@ -362,8 +362,8 @@ private class Private : A1 {}
}
// CHECK-LABEL: @interface PropertiesOverridden
// CHECK-NEXT: @property (nonatomic, copy, getter=bees, setter=setBees:) NS_ARRAY(Bee *) __nonnull bees;
// CHECK-NEXT: - (instancetype)init
// CHECK-NEXT: @property (nonatomic, copy, getter=bees, setter=setBees:) NS_ARRAY(Bee * __nonnull) __nonnull bees;
// CHECK-NEXT: - (SWIFT_NULLABILITY(null_unspecified) instancetype)init
// CHECK-NEXT: @end
@objc class PropertiesOverridden : Hive {
override var bees : [Bee] {
@@ -407,7 +407,7 @@ private class Private : A1 {}
// CHECK-NEXT: - (void)setObject:(Subscripts2 * __nonnull)newValue atIndexedSubscript:(int16_t)i;
// CHECK-NEXT: - (NSObject * __nonnull)objectForKeyedSubscript:(NSObject * __nonnull)o;
// CHECK-NEXT: - (void)setObject:(NSObject * __nonnull)newValue forKeyedSubscript:(NSObject * __nonnull)o;
// CHECK-NEXT: @property (nonatomic, copy) NS_ARRAY(NSString *) __nonnull cardPaths;
// CHECK-NEXT: @property (nonatomic, copy) NS_ARRAY(NSString * __nonnull) __nonnull cardPaths;
// CHECK-NEXT: init
// CHECK-NEXT: @end
@objc class Subscripts2 {