Skip to content

Commit c24a6dc

Browse files
authored
Merge pull request #2368 from xymus/warn-ns-error-domain
[clang] Downgrade err_nserrordomain_invalid_decl to a warning
2 parents 6151836 + 66a6274 commit c24a6dc

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

clang/include/clang/Basic/DiagnosticSemaKinds.td

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9751,6 +9751,8 @@ def err_nsreturns_retained_attribute_mismatch : Error<
97519751
" attributes">;
97529752
def err_nserrordomain_invalid_decl : Error<
97539753
"domain argument %select{|%1 }0does not refer to global constant">;
9754+
def warn_nserrordomain_invalid_decl : Warning<
9755+
"domain argument %select{|%1 }0does not refer to global constant">;
97549756
def err_nserrordomain_wrong_type : Error<
97559757
"domain argument %0 does not point to an NSString or CFString constant">;
97569758

clang/lib/Sema/SemaDeclAttr.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5545,7 +5545,7 @@ static void handleNSErrorDomain(Sema &S, Decl *D, const ParsedAttr &AL) {
55455545

55465546
auto *DRE = dyn_cast<DeclRefExpr>(AL.getArgAsExpr(0));
55475547
if (!DRE) {
5548-
S.Diag(Loc, diag::err_nserrordomain_invalid_decl) << 0;
5548+
S.Diag(Loc, diag::warn_nserrordomain_invalid_decl) << 0;
55495549
return;
55505550
}
55515551

clang/test/Sema/ns_error_enum.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ typedef NS_ERROR_ENUM(unsigned char, MyErrorEnumInvalid, InvalidDomain) {
7474
};
7575

7676
typedef NS_ERROR_ENUM(unsigned char, MyErrorEnumInvalid, "domain-string");
77-
// expected-error@-1{{domain argument does not refer to global constant}}
77+
// expected-warning@-1{{domain argument does not refer to global constant}}
7878

7979
void foo() {}
8080
typedef NS_ERROR_ENUM(unsigned char, MyErrorEnumInvalidFunction, foo);

0 commit comments

Comments
 (0)