diff --git a/clang/test/ARCMT/objcmt-arc-cf-annotations.m b/clang/test/ARCMT/objcmt-arc-cf-annotations.m --- a/clang/test/ARCMT/objcmt-arc-cf-annotations.m +++ b/clang/test/ARCMT/objcmt-arc-cf-annotations.m @@ -220,14 +220,14 @@ typedef io_object_t io_service_t; typedef struct IONotificationPort * IONotificationPortRef; typedef void (*IOServiceMatchingCallback)( void * refcon, io_iterator_t iterator ); -io_service_t IOServiceGetMatchingService( mach_port_t masterPort, CFDictionaryRef matching ); -kern_return_t IOServiceGetMatchingServices( mach_port_t masterPort, CFDictionaryRef matching, io_iterator_t * existing ); -kern_return_t IOServiceAddNotification( mach_port_t masterPort, const io_name_t notificationType, CFDictionaryRef matching, mach_port_t wakePort, uintptr_t reference, io_iterator_t * notification ) __attribute__((deprecated)); // expected-note {{'IOServiceAddNotification' declared here}} +io_service_t IOServiceGetMatchingService( mach_port_t mainPort, CFDictionaryRef matching ); +kern_return_t IOServiceGetMatchingServices( mach_port_t mainPort, CFDictionaryRef matching, io_iterator_t * existing ); +kern_return_t IOServiceAddNotification( mach_port_t mainPort, const io_name_t notificationType, CFDictionaryRef matching, mach_port_t wakePort, uintptr_t reference, io_iterator_t * notification ) __attribute__((deprecated)); // expected-note {{'IOServiceAddNotification' declared here}} kern_return_t IOServiceAddMatchingNotification( IONotificationPortRef notifyPort, const io_name_t notificationType, CFDictionaryRef matching, IOServiceMatchingCallback callback, void * refCon, io_iterator_t * notification ); CFMutableDictionaryRef IOServiceMatching( const char * name ); CFMutableDictionaryRef IOServiceNameMatching( const char * name ); -CFMutableDictionaryRef IOBSDNameMatching( mach_port_t masterPort, uint32_t options, const char * bsdName ); -CFMutableDictionaryRef IOOpenFirmwarePathMatching( mach_port_t masterPort, uint32_t options, const char * path ); +CFMutableDictionaryRef IOBSDNameMatching( mach_port_t mainPort, uint32_t options, const char * bsdName ); +CFMutableDictionaryRef IOOpenFirmwarePathMatching( mach_port_t mainPort, uint32_t options, const char * path ); CFMutableDictionaryRef IORegistryEntryIDMatching( uint64_t entryID ); typedef struct __DASession * DASessionRef; extern DASessionRef DASessionCreate( CFAllocatorRef allocator ); @@ -964,8 +964,8 @@ // checker //===----------------------------------------------------------------------===// -void IOBSDNameMatching_wrapper(mach_port_t masterPort, uint32_t options, const char * bsdName) { - IOBSDNameMatching(masterPort, options, bsdName); // expected-warning{{leak}} +void IOBSDNameMatching_wrapper(mach_port_t mainPort, uint32_t options, const char * bsdName) { + IOBSDNameMatching(mainPort, options, bsdName); // expected-warning{{leak}} } void IOServiceMatching_wrapper(const char * name) { @@ -978,12 +978,12 @@ CF_RETURNS_RETAINED CFDictionaryRef CreateDict(); -void IOServiceAddNotification_wrapper(mach_port_t masterPort, const io_name_t notificationType, +void IOServiceAddNotification_wrapper(mach_port_t mainPort, const io_name_t notificationType, mach_port_t wakePort, uintptr_t reference, io_iterator_t * notification ) { CFDictionaryRef matching = CreateDict(); CFRelease(matching); - IOServiceAddNotification(masterPort, notificationType, matching, // expected-warning{{used after it is released}} expected-warning{{deprecated}} + IOServiceAddNotification(mainPort, notificationType, matching, // expected-warning{{used after it is released}} expected-warning{{deprecated}} wakePort, reference, notification); } @@ -991,20 +991,20 @@ IORegistryEntryIDMatching(entryID); // expected-warning{{leak}} } -void IOOpenFirmwarePathMatching_wrapper(mach_port_t masterPort, uint32_t options, +void IOOpenFirmwarePathMatching_wrapper(mach_port_t mainPort, uint32_t options, const char * path) { - IOOpenFirmwarePathMatching(masterPort, options, path); // expected-warning{{leak}} + IOOpenFirmwarePathMatching(mainPort, options, path); // expected-warning{{leak}} } -void IOServiceGetMatchingService_wrapper(mach_port_t masterPort) { +void IOServiceGetMatchingService_wrapper(mach_port_t mainPort) { CFDictionaryRef matching = CreateDict(); - IOServiceGetMatchingService(masterPort, matching); + IOServiceGetMatchingService(mainPort, matching); CFRelease(matching); // expected-warning{{used after it is released}} } -void IOServiceGetMatchingServices_wrapper(mach_port_t masterPort, io_iterator_t *existing) { +void IOServiceGetMatchingServices_wrapper(mach_port_t mainPort, io_iterator_t *existing) { CFDictionaryRef matching = CreateDict(); - IOServiceGetMatchingServices(masterPort, matching, existing); + IOServiceGetMatchingServices(mainPort, matching, existing); CFRelease(matching); // expected-warning{{used after it is released}} } diff --git a/clang/test/ARCMT/objcmt-arc-cf-annotations.m.result b/clang/test/ARCMT/objcmt-arc-cf-annotations.m.result --- a/clang/test/ARCMT/objcmt-arc-cf-annotations.m.result +++ b/clang/test/ARCMT/objcmt-arc-cf-annotations.m.result @@ -229,20 +229,20 @@ CF_IMPLICIT_BRIDGING_ENABLED -io_service_t IOServiceGetMatchingService( mach_port_t masterPort, CFDictionaryRef matching ); -kern_return_t IOServiceGetMatchingServices( mach_port_t masterPort, CFDictionaryRef matching, io_iterator_t * existing ); +io_service_t IOServiceGetMatchingService( mach_port_t mainPort, CFDictionaryRef matching ); +kern_return_t IOServiceGetMatchingServices( mach_port_t mainPort, CFDictionaryRef matching, io_iterator_t * existing ); CF_IMPLICIT_BRIDGING_DISABLED -kern_return_t IOServiceAddNotification( mach_port_t masterPort, const io_name_t notificationType, CFDictionaryRef matching, mach_port_t wakePort, uintptr_t reference, io_iterator_t * notification ) __attribute__((deprecated)); // expected-note {{'IOServiceAddNotification' declared here}} +kern_return_t IOServiceAddNotification( mach_port_t mainPort, const io_name_t notificationType, CFDictionaryRef matching, mach_port_t wakePort, uintptr_t reference, io_iterator_t * notification ) __attribute__((deprecated)); // expected-note {{'IOServiceAddNotification' declared here}} kern_return_t IOServiceAddMatchingNotification( IONotificationPortRef notifyPort, const io_name_t notificationType, CFDictionaryRef CF_CONSUMED matching, IOServiceMatchingCallback callback, void * refCon, io_iterator_t * notification ); CF_IMPLICIT_BRIDGING_ENABLED CFMutableDictionaryRef IOServiceMatching( const char * name ); CFMutableDictionaryRef IOServiceNameMatching( const char * name ); -CFMutableDictionaryRef IOBSDNameMatching( mach_port_t masterPort, uint32_t options, const char * bsdName ); -CFMutableDictionaryRef IOOpenFirmwarePathMatching( mach_port_t masterPort, uint32_t options, const char * path ); +CFMutableDictionaryRef IOBSDNameMatching( mach_port_t mainPort, uint32_t options, const char * bsdName ); +CFMutableDictionaryRef IOOpenFirmwarePathMatching( mach_port_t mainPort, uint32_t options, const char * path ); CFMutableDictionaryRef IORegistryEntryIDMatching( uint64_t entryID ); CF_IMPLICIT_BRIDGING_DISABLED @@ -1006,8 +1006,8 @@ // checker //===----------------------------------------------------------------------===// -void IOBSDNameMatching_wrapper(mach_port_t masterPort, uint32_t options, const char * bsdName) { - IOBSDNameMatching(masterPort, options, bsdName); // expected-warning{{leak}} +void IOBSDNameMatching_wrapper(mach_port_t mainPort, uint32_t options, const char * bsdName) { + IOBSDNameMatching(mainPort, options, bsdName); // expected-warning{{leak}} } void IOServiceMatching_wrapper(const char * name) { @@ -1020,12 +1020,12 @@ CF_RETURNS_RETAINED CFDictionaryRef CreateDict(); -void IOServiceAddNotification_wrapper(mach_port_t masterPort, const io_name_t notificationType, +void IOServiceAddNotification_wrapper(mach_port_t mainPort, const io_name_t notificationType, mach_port_t wakePort, uintptr_t reference, io_iterator_t * notification ) { CFDictionaryRef matching = CreateDict(); CFRelease(matching); - IOServiceAddNotification(masterPort, notificationType, matching, // expected-warning{{used after it is released}} expected-warning{{deprecated}} + IOServiceAddNotification(mainPort, notificationType, matching, // expected-warning{{used after it is released}} expected-warning{{deprecated}} wakePort, reference, notification); } @@ -1033,20 +1033,20 @@ IORegistryEntryIDMatching(entryID); // expected-warning{{leak}} } -void IOOpenFirmwarePathMatching_wrapper(mach_port_t masterPort, uint32_t options, +void IOOpenFirmwarePathMatching_wrapper(mach_port_t mainPort, uint32_t options, const char * path) { - IOOpenFirmwarePathMatching(masterPort, options, path); // expected-warning{{leak}} + IOOpenFirmwarePathMatching(mainPort, options, path); // expected-warning{{leak}} } -void IOServiceGetMatchingService_wrapper(mach_port_t masterPort) { +void IOServiceGetMatchingService_wrapper(mach_port_t mainPort) { CFDictionaryRef matching = CreateDict(); - IOServiceGetMatchingService(masterPort, matching); + IOServiceGetMatchingService(mainPort, matching); CFRelease(matching); // expected-warning{{used after it is released}} } -void IOServiceGetMatchingServices_wrapper(mach_port_t masterPort, io_iterator_t *existing) { +void IOServiceGetMatchingServices_wrapper(mach_port_t mainPort, io_iterator_t *existing) { CFDictionaryRef matching = CreateDict(); - IOServiceGetMatchingServices(masterPort, matching, existing); + IOServiceGetMatchingServices(mainPort, matching, existing); CFRelease(matching); // expected-warning{{used after it is released}} } diff --git a/clang/test/Analysis/Inputs/expected-plists/retain-release.m.objc.plist b/clang/test/Analysis/Inputs/expected-plists/retain-release.m.objc.plist --- a/clang/test/Analysis/Inputs/expected-plists/retain-release.m.objc.plist +++ b/clang/test/Analysis/Inputs/expected-plists/retain-release.m.objc.plist @@ -13527,7 +13527,7 @@ line1074 - col49 + col47 file0 @@ -13592,7 +13592,7 @@ typeLeak check_nameosx.cocoa.RetainCount - issue_hash_content_of_line_in_context540e0145994c1e14ea750fe91a497855 + issue_hash_content_of_line_in_context646df6701094605a8d6cfc0086d99e19 issue_context_kindfunction issue_contextIOBSDNameMatching_wrapper issue_hash_function_offset1 @@ -13978,12 +13978,12 @@ line1092 - col58 + col56 file0 line1092 - col65 + col63 file0 @@ -14000,7 +14000,7 @@ typeUse-after-release check_nameosx.cocoa.RetainCount - issue_hash_content_of_line_in_context84a53bfb58a3a929535b47e28b997382 + issue_hash_content_of_line_in_context7bb07bd5b2685d66ce9454c2eecd2fe2 issue_context_kindfunction issue_contextIOServiceAddNotification_wrapper issue_hash_function_offset4 @@ -14150,7 +14150,7 @@ line1102 - col55 + col53 file0 @@ -14215,7 +14215,7 @@ typeLeak check_nameosx.cocoa.RetainCount - issue_hash_content_of_line_in_contextee83ca968ddc2ecad7ae4318ce7d1d95 + issue_hash_content_of_line_in_context978acda8588031f1569c1b542f39d92a issue_context_kindfunction issue_contextIOOpenFirmwarePathMatching_wrapper issue_hash_function_offset1 @@ -14320,19 +14320,19 @@ line1107 - col51 + col49 file0 line1107 - col43 + col41 file0 line1107 - col50 + col48 file0 @@ -14517,19 +14517,19 @@ line1113 - col62 + col60 file0 line1113 - col44 + col42 file0 line1113 - col51 + col49 file0 diff --git a/clang/test/Analysis/Inputs/expected-plists/retain-release.m.objcpp.plist b/clang/test/Analysis/Inputs/expected-plists/retain-release.m.objcpp.plist --- a/clang/test/Analysis/Inputs/expected-plists/retain-release.m.objcpp.plist +++ b/clang/test/Analysis/Inputs/expected-plists/retain-release.m.objcpp.plist @@ -13595,7 +13595,7 @@ line1074 - col49 + col47 file0 @@ -13660,7 +13660,7 @@ typeLeak check_nameosx.cocoa.RetainCount - issue_hash_content_of_line_in_context540e0145994c1e14ea750fe91a497855 + issue_hash_content_of_line_in_context646df6701094605a8d6cfc0086d99e19 issue_context_kindfunction issue_contextIOBSDNameMatching_wrapper issue_hash_function_offset1 @@ -14046,12 +14046,12 @@ line1092 - col58 + col56 file0 line1092 - col65 + col63 file0 @@ -14068,7 +14068,7 @@ typeUse-after-release check_nameosx.cocoa.RetainCount - issue_hash_content_of_line_in_context84a53bfb58a3a929535b47e28b997382 + issue_hash_content_of_line_in_context7bb07bd5b2685d66ce9454c2eecd2fe2 issue_context_kindfunction issue_contextIOServiceAddNotification_wrapper issue_hash_function_offset4 @@ -14218,7 +14218,7 @@ line1102 - col55 + col53 file0 @@ -14283,7 +14283,7 @@ typeLeak check_nameosx.cocoa.RetainCount - issue_hash_content_of_line_in_contextee83ca968ddc2ecad7ae4318ce7d1d95 + issue_hash_content_of_line_in_context978acda8588031f1569c1b542f39d92a issue_context_kindfunction issue_contextIOOpenFirmwarePathMatching_wrapper issue_hash_function_offset1 @@ -14388,19 +14388,19 @@ line1107 - col51 + col49 file0 line1107 - col43 + col41 file0 line1107 - col50 + col48 file0 @@ -14585,19 +14585,19 @@ line1113 - col62 + col60 file0 line1113 - col44 + col42 file0 line1113 - col51 + col49 file0 diff --git a/clang/test/Analysis/retain-release-inline.m b/clang/test/Analysis/retain-release-inline.m --- a/clang/test/Analysis/retain-release-inline.m +++ b/clang/test/Analysis/retain-release-inline.m @@ -155,14 +155,14 @@ typedef io_object_t io_service_t; typedef struct IONotificationPort * IONotificationPortRef; typedef void (*IOServiceMatchingCallback)( void * refcon, io_iterator_t iterator ); -io_service_t IOServiceGetMatchingService( mach_port_t masterPort, CFDictionaryRef matching ); -kern_return_t IOServiceGetMatchingServices( mach_port_t masterPort, CFDictionaryRef matching, io_iterator_t * existing ); -kern_return_t IOServiceAddNotification( mach_port_t masterPort, const io_name_t notificationType, CFDictionaryRef matching, mach_port_t wakePort, uintptr_t reference, io_iterator_t * notification ) __attribute__((deprecated)); +io_service_t IOServiceGetMatchingService( mach_port_t mainPort, CFDictionaryRef matching ); +kern_return_t IOServiceGetMatchingServices( mach_port_t mainPort, CFDictionaryRef matching, io_iterator_t * existing ); +kern_return_t IOServiceAddNotification( mach_port_t mainPort, const io_name_t notificationType, CFDictionaryRef matching, mach_port_t wakePort, uintptr_t reference, io_iterator_t * notification ) __attribute__((deprecated)); kern_return_t IOServiceAddMatchingNotification( IONotificationPortRef notifyPort, const io_name_t notificationType, CFDictionaryRef matching, IOServiceMatchingCallback callback, void * refCon, io_iterator_t * notification ); CFMutableDictionaryRef IOServiceMatching( const char * name ); CFMutableDictionaryRef IOServiceNameMatching( const char * name ); -CFMutableDictionaryRef IOBSDNameMatching( mach_port_t masterPort, uint32_t options, const char * bsdName ); -CFMutableDictionaryRef IOOpenFirmwarePathMatching( mach_port_t masterPort, uint32_t options, const char * path ); +CFMutableDictionaryRef IOBSDNameMatching( mach_port_t mainPort, uint32_t options, const char * bsdName ); +CFMutableDictionaryRef IOOpenFirmwarePathMatching( mach_port_t mainPort, uint32_t options, const char * path ); CFMutableDictionaryRef IORegistryEntryIDMatching( uint64_t entryID ); typedef struct __DASession * DASessionRef; extern DASessionRef DASessionCreate( CFAllocatorRef allocator ); diff --git a/clang/test/Analysis/retain-release.m b/clang/test/Analysis/retain-release.m --- a/clang/test/Analysis/retain-release.m +++ b/clang/test/Analysis/retain-release.m @@ -233,14 +233,14 @@ typedef io_object_t io_service_t; typedef struct IONotificationPort * IONotificationPortRef; typedef void (*IOServiceMatchingCallback)( void * refcon, io_iterator_t iterator ); -io_service_t IOServiceGetMatchingService( mach_port_t masterPort, CFDictionaryRef matching ); -kern_return_t IOServiceGetMatchingServices( mach_port_t masterPort, CFDictionaryRef matching, io_iterator_t * existing ); -kern_return_t IOServiceAddNotification( mach_port_t masterPort, const io_name_t notificationType, CFDictionaryRef matching, mach_port_t wakePort, uintptr_t reference, io_iterator_t * notification ) __attribute__((deprecated)); // expected-note {{'IOServiceAddNotification' has been explicitly marked deprecated here}} +io_service_t IOServiceGetMatchingService( mach_port_t mainPort, CFDictionaryRef matching ); +kern_return_t IOServiceGetMatchingServices( mach_port_t mainPort, CFDictionaryRef matching, io_iterator_t * existing ); +kern_return_t IOServiceAddNotification( mach_port_t mainPort, const io_name_t notificationType, CFDictionaryRef matching, mach_port_t wakePort, uintptr_t reference, io_iterator_t * notification ) __attribute__((deprecated)); // expected-note {{'IOServiceAddNotification' has been explicitly marked deprecated here}} kern_return_t IOServiceAddMatchingNotification( IONotificationPortRef notifyPort, const io_name_t notificationType, CFDictionaryRef matching, IOServiceMatchingCallback callback, void * refCon, io_iterator_t * notification ); CFMutableDictionaryRef IOServiceMatching( const char * name ); CFMutableDictionaryRef IOServiceNameMatching( const char * name ); -CFMutableDictionaryRef IOBSDNameMatching( mach_port_t masterPort, uint32_t options, const char * bsdName ); -CFMutableDictionaryRef IOOpenFirmwarePathMatching( mach_port_t masterPort, uint32_t options, const char * path ); +CFMutableDictionaryRef IOBSDNameMatching( mach_port_t mainPort, uint32_t options, const char * bsdName ); +CFMutableDictionaryRef IOOpenFirmwarePathMatching( mach_port_t mainPort, uint32_t options, const char * path ); CFMutableDictionaryRef IORegistryEntryIDMatching( uint64_t entryID ); typedef struct __DASession * DASessionRef; extern DASessionRef DASessionCreate( CFAllocatorRef allocator ); @@ -1070,8 +1070,8 @@ // checker //===----------------------------------------------------------------------===// -void IOBSDNameMatching_wrapper(mach_port_t masterPort, uint32_t options, const char * bsdName) { - IOBSDNameMatching(masterPort, options, bsdName); // expected-warning{{leak}} +void IOBSDNameMatching_wrapper(mach_port_t mainPort, uint32_t options, const char * bsdName) { + IOBSDNameMatching(mainPort, options, bsdName); // expected-warning{{leak}} } void IOServiceMatching_wrapper(const char * name) { @@ -1084,12 +1084,12 @@ CF_RETURNS_RETAINED CFDictionaryRef CreateDict(); -void IOServiceAddNotification_wrapper(mach_port_t masterPort, const io_name_t notificationType, +void IOServiceAddNotification_wrapper(mach_port_t mainPort, const io_name_t notificationType, mach_port_t wakePort, uintptr_t reference, io_iterator_t * notification ) { CFDictionaryRef matching = CreateDict(); CFRelease(matching); - IOServiceAddNotification(masterPort, notificationType, matching, // expected-warning{{used after it is released}} expected-warning{{deprecated}} + IOServiceAddNotification(mainPort, notificationType, matching, // expected-warning{{used after it is released}} expected-warning{{deprecated}} wakePort, reference, notification); } @@ -1097,20 +1097,20 @@ IORegistryEntryIDMatching(entryID); // expected-warning{{leak}} } -void IOOpenFirmwarePathMatching_wrapper(mach_port_t masterPort, uint32_t options, +void IOOpenFirmwarePathMatching_wrapper(mach_port_t mainPort, uint32_t options, const char * path) { - IOOpenFirmwarePathMatching(masterPort, options, path); // expected-warning{{leak}} + IOOpenFirmwarePathMatching(mainPort, options, path); // expected-warning{{leak}} } -void IOServiceGetMatchingService_wrapper(mach_port_t masterPort) { +void IOServiceGetMatchingService_wrapper(mach_port_t mainPort) { CFDictionaryRef matching = CreateDict(); - IOServiceGetMatchingService(masterPort, matching); + IOServiceGetMatchingService(mainPort, matching); CFRelease(matching); // expected-warning{{used after it is released}} } -void IOServiceGetMatchingServices_wrapper(mach_port_t masterPort, io_iterator_t *existing) { +void IOServiceGetMatchingServices_wrapper(mach_port_t mainPort, io_iterator_t *existing) { CFDictionaryRef matching = CreateDict(); - IOServiceGetMatchingServices(masterPort, matching, existing); + IOServiceGetMatchingServices(mainPort, matching, existing); CFRelease(matching); // expected-warning{{used after it is released}} } diff --git a/clang/test/Analysis/retain-release.mm b/clang/test/Analysis/retain-release.mm --- a/clang/test/Analysis/retain-release.mm +++ b/clang/test/Analysis/retain-release.mm @@ -175,14 +175,14 @@ typedef io_object_t io_service_t; typedef struct IONotificationPort * IONotificationPortRef; typedef void (*IOServiceMatchingCallback)( void * refcon, io_iterator_t iterator ); -io_service_t IOServiceGetMatchingService( mach_port_t masterPort, CFDictionaryRef matching ); -kern_return_t IOServiceGetMatchingServices( mach_port_t masterPort, CFDictionaryRef matching, io_iterator_t * existing ); -kern_return_t IOServiceAddNotification( mach_port_t masterPort, const io_name_t notificationType, CFDictionaryRef matching, mach_port_t wakePort, uintptr_t reference, io_iterator_t * notification ) __attribute__((deprecated)); +io_service_t IOServiceGetMatchingService( mach_port_t mainPort, CFDictionaryRef matching ); +kern_return_t IOServiceGetMatchingServices( mach_port_t mainPort, CFDictionaryRef matching, io_iterator_t * existing ); +kern_return_t IOServiceAddNotification( mach_port_t mainPort, const io_name_t notificationType, CFDictionaryRef matching, mach_port_t wakePort, uintptr_t reference, io_iterator_t * notification ) __attribute__((deprecated)); kern_return_t IOServiceAddMatchingNotification( IONotificationPortRef notifyPort, const io_name_t notificationType, CFDictionaryRef matching, IOServiceMatchingCallback callback, void * refCon, io_iterator_t * notification ); CFMutableDictionaryRef IOServiceMatching( const char * name ); CFMutableDictionaryRef IOServiceNameMatching( const char * name ); -CFMutableDictionaryRef IOBSDNameMatching( mach_port_t masterPort, uint32_t options, const char * bsdName ); -CFMutableDictionaryRef IOOpenFirmwarePathMatching( mach_port_t masterPort, uint32_t options, const char * path ); +CFMutableDictionaryRef IOBSDNameMatching( mach_port_t mainPort, uint32_t options, const char * bsdName ); +CFMutableDictionaryRef IOOpenFirmwarePathMatching( mach_port_t mainPort, uint32_t options, const char * path ); CFMutableDictionaryRef IORegistryEntryIDMatching( uint64_t entryID ); typedef struct __DASession * DASessionRef; extern DASessionRef DASessionCreate( CFAllocatorRef allocator );