diff options
| -rw-r--r-- | clang/lib/Sema/SemaType.cpp | 19 | ||||
| -rw-r--r-- | clang/test/SemaObjCXX/Inputs/nullability-completeness-cferror.h | 13 | ||||
| -rw-r--r-- | clang/test/SemaObjCXX/nullability-completeness-cferror.mm | 5 |
3 files changed, 31 insertions, 6 deletions
diff --git a/clang/lib/Sema/SemaType.cpp b/clang/lib/Sema/SemaType.cpp index 80b6c1d00da..ec0d93cf678 100644 --- a/clang/lib/Sema/SemaType.cpp +++ b/clang/lib/Sema/SemaType.cpp @@ -3482,13 +3482,20 @@ classifyPointerDeclarator(Sema &S, QualType type, Declarator &declarator, isCFError = (S.CFError == recordDecl); } else { // Check whether this is CFError, which we identify based on its bridge - // to NSError. + // to NSError. CFErrorRef used to be declared with "objc_bridge" but is + // now declared with "objc_bridge_mutable", so look for either one of + // the two attributes. if (recordDecl->getTagKind() == TTK_Struct && numNormalPointers > 0) { - if (auto bridgeAttr = recordDecl->getAttr<ObjCBridgeAttr>()) { - if (bridgeAttr->getBridgedType() == S.getNSErrorIdent()) { - S.CFError = recordDecl; - isCFError = true; - } + IdentifierInfo *bridgedType = nullptr; + if (auto bridgeAttr = recordDecl->getAttr<ObjCBridgeAttr>()) + bridgedType = bridgeAttr->getBridgedType(); + else if (auto bridgeAttr = + recordDecl->getAttr<ObjCBridgeMutableAttr>()) + bridgedType = bridgeAttr->getBridgedType(); + + if (bridgedType == S.getNSErrorIdent()) { + S.CFError = recordDecl; + isCFError = true; } } } diff --git a/clang/test/SemaObjCXX/Inputs/nullability-completeness-cferror.h b/clang/test/SemaObjCXX/Inputs/nullability-completeness-cferror.h new file mode 100644 index 00000000000..4988a7491c2 --- /dev/null +++ b/clang/test/SemaObjCXX/Inputs/nullability-completeness-cferror.h @@ -0,0 +1,13 @@ +@class NSError; + +#pragma clang assume_nonnull begin + +#ifdef USE_MUTABLE +typedef struct __attribute__((objc_bridge_mutable(NSError))) __CFError * CFErrorRef; +#else +typedef struct __attribute__((objc_bridge(NSError))) __CFError * CFErrorRef; +#endif + +void func1(CFErrorRef *error); + +#pragma clang assume_nonnull end diff --git a/clang/test/SemaObjCXX/nullability-completeness-cferror.mm b/clang/test/SemaObjCXX/nullability-completeness-cferror.mm new file mode 100644 index 00000000000..4cea9fba927 --- /dev/null +++ b/clang/test/SemaObjCXX/nullability-completeness-cferror.mm @@ -0,0 +1,5 @@ +// RUN: %clang_cc1 -fsyntax-only -I %S/Inputs -x objective-c -Wnullability-completeness -Werror -verify %s +// RUN: %clang_cc1 -fsyntax-only -I %S/Inputs -x objective-c -Wnullability-completeness -Werror -verify -DUSE_MUTABLE %s +// expected-no-diagnostics + +#include "nullability-completeness-cferror.h" |
