diff options
| -rw-r--r-- | lib/AST/Type.cpp | 6 | ||||
| -rw-r--r-- | test/SemaObjC/nullability_macro.m | 16 |
2 files changed, 21 insertions, 1 deletions
diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp index 590e534fbd..101c5184a5 100644 --- a/lib/AST/Type.cpp +++ b/lib/AST/Type.cpp @@ -3929,7 +3929,11 @@ AttributedType::getImmediateNullability() const { } Optional<NullabilityKind> AttributedType::stripOuterNullability(QualType &T) { - if (auto attributed = dyn_cast<AttributedType>(T.getTypePtr())) { + QualType AttrTy = T; + if (auto MacroTy = dyn_cast<MacroQualifiedType>(T)) + AttrTy = MacroTy->getUnderlyingType(); + + if (auto attributed = dyn_cast<AttributedType>(AttrTy)) { if (auto nullability = attributed->getImmediateNullability()) { T = attributed->getModifiedType(); return nullability; diff --git a/test/SemaObjC/nullability_macro.m b/test/SemaObjC/nullability_macro.m new file mode 100644 index 0000000000..436bbea9c3 --- /dev/null +++ b/test/SemaObjC/nullability_macro.m @@ -0,0 +1,16 @@ +// Test that nullability attributes still get merged even though they are +// wrapped with a MacroQualifiedType. This should just compile with no errors. +// RUN: %clang_cc1 %s -Wno-objc-root-class -fsyntax-only -verify +#define UI_APPEARANCE_SELECTOR __attribute__((annotate("ui_appearance_selector"))) + +@class UIColor; + +@interface Test +@property(null_resettable, nonatomic, strong) UIColor *onTintColor UI_APPEARANCE_SELECTOR; // expected-warning{{treating Unicode character as whitespace}} +@end + +@implementation Test +- (void)setOnTintColor:(nullable UIColor *)onTintColor { +} + +@end |