[clang] 6056511 - Fix failing test case with strict prototype changes

[Aaron Ballman via cfe-commits]

Author: Aaron Ballman
Date: 2022-05-26T08:46:11-04:00
New Revision: 605651135b4c37e423825a9201b06a16ff6160a1

URL: https://github.com/llvm/llvm-project/commit/605651135b4c37e423825a9201b06a16ff6160a1
DIFF: https://github.com/llvm/llvm-project/commit/605651135b4c37e423825a9201b06a16ff6160a1.diff

LOG: Fix failing test case with strict prototype changes

Amends 681c50c62e9338afdf58ebfd663f8e3ff43439fb and hopefully fixes:

https://lab.llvm.org/buildbot/#/builders/109/builds/39347
https://lab.llvm.org/buildbot/#/builders/188/builds/14634
and others

Added: 
    

Modified: 
    clang/test/SemaObjC/nonnull.m

Removed: 
    


################################################################################
diff  --git a/clang/test/SemaObjC/nonnull.m b/clang/test/SemaObjC/nonnull.m
index 3b087b096d8f..218aad85e673 100644
--- a/clang/test/SemaObjC/nonnull.m
+++ b/clang/test/SemaObjC/nonnull.m
@@ -22,7 +22,7 @@ extern void func3 (void (^block1)(), int, void (^block2)(), int)
 extern void func4 (void (^block1)(), void (^block2)()) __attribute__((nonnull(1)))
 __attribute__((nonnull(2)));
 
-void func6(); // expected-warning {{a function declaration without a prototype is deprecated in all versions of C and is not supported in C2x}}
+void func6(); // expected-warning {{a function declaration without a prototype is deprecated in all versions of C and is treated as a zero-parameter prototype in C2x, conflicting with a subsequent definition}}
 void func7();
 
 void
@@ -60,7 +60,7 @@ extern void func4 (void (^block1)(), void (^block2)()) __attribute__((nonnull(1)
 __attribute__((nonnull))
 void _dispatch_queue_push_list(dispatch_object_t _head); // no warning
 
-void func6(dispatch_object_t _head) { // expected-warning {{a function declaration without a prototype is deprecated in all versions of C and is not supported in C2x}}
+void func6(dispatch_object_t _head) { // expected-note {{conflicting prototype is here}}
   _dispatch_queue_push_list(0); // expected-warning {{null passed to a callee that requires a non-null argument}}
   _dispatch_queue_push_list(_head._do);  // no warning
 }