Skip to content

Commit df49a4b

Browse files
authored
Merge pull request #2373 from xymus/warn-ns-error-domain-apinotes
[clang] Only use warn_nserrordomain_invalid_decl for APINotes
2 parents c24a6dc + c301d75 commit df49a4b

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

clang/lib/Sema/SemaAPINotes.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ static void ProcessAPINotes(Sema &S, Decl *D,
357357
auto *VD = lookupResult.getAsSingle<VarDecl>();
358358

359359
if (!VD) {
360-
S.Diag(D->getLocation(), diag::err_nserrordomain_invalid_decl) << 0;
360+
S.Diag(D->getLocation(), diag::warn_nserrordomain_invalid_decl) << 0;
361361
return nullptr;
362362
}
363363

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::warn_nserrordomain_invalid_decl) << 0;
5548+
S.Diag(Loc, diag::err_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-warning@-1{{domain argument does not refer to global constant}}
77+
// expected-error@-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)