Skip to content

Commit 2133dc5

Browse files
committed
[Clang] Fix conflict resolution in SemaDeclAttr
1 parent 30064ec commit 2133dc5

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

clang/lib/Sema/SemaDeclAttr.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6938,10 +6938,8 @@ ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D, const ParsedAttr &AL,
69386938
Aux && AL.existsInTarget(*Aux)))) {
69396939
if (AL.isRegularKeywordAttribute() || AL.isDeclspecAttribute()) {
69406940
S.Diag(AL.getLoc(), AL.isRegularKeywordAttribute()
6941-
? (unsigned)diag::err_keyword_not_supported_on_target
6942-
: AL.isDeclspecAttribute()
6943-
? (unsigned)diag::warn_unhandled_ms_attribute_ignored
6944-
: (unsigned)diag::warn_unknown_attribute_ignored)
6941+
? diag::err_keyword_not_supported_on_target
6942+
: diag::warn_unhandled_ms_attribute_ignored)
69456943
<< AL.getAttrName() << AL.getRange();
69466944
} else {
69476945
S.Diag(AL.getNormalizedRange().getBegin(),

0 commit comments

Comments
 (0)