commit fc0ff61f311e71232a1e47b4504f8284a5af4cd1
author Simon Pilgrim <llvm-dev@redking.me.uk> Mon Dec 17 12:17:37 2018 +0000
committer Simon Pilgrim <llvm-dev@redking.me.uk> Mon Dec 17 12:17:37 2018 +0000
tree 81d979f602cba24ecd28861e0fd43b028b6e7f78
parent 224ddd5b11ce32dae71dd1d5a9af30ca326c9c72

Fix "enumeral mismatch in conditional expression" gcc7 warnings. NFCI.

llvm-svn: 349342

clang/lib/Sema/SemaDeclAttr.cpp

diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
index 78374b8..ba041a8 100644
--- a/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -6103,9 +6103,10 @@
   // though they were unknown attributes.
   if (AL.getKind() == ParsedAttr::UnknownAttribute ||
       !AL.existsInTarget(S.Context.getTargetInfo())) {
-    S.Diag(AL.getLoc(), AL.isDeclspecAttribute()
-                            ? diag::warn_unhandled_ms_attribute_ignored
-                            : diag::warn_unknown_attribute_ignored)
+    S.Diag(AL.getLoc(),
+           AL.isDeclspecAttribute()
+               ? (unsigned)diag::warn_unhandled_ms_attribute_ignored
+               : (unsigned)diag::warn_unknown_attribute_ignored)
         << AL;
     return;
   }

clang/lib/Sema/SemaDeclCXX.cpp

diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index d56c880..d46aa23 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -2347,8 +2347,8 @@
     if (AL.isInvalid() || AL.getKind() == ParsedAttr::IgnoredAttribute)
       continue;
     Diag(AL.getLoc(), AL.getKind() == ParsedAttr::UnknownAttribute
-                          ? diag::warn_unknown_attribute_ignored
-                          : diag::err_base_specifier_attribute)
+                          ? (unsigned)diag::warn_unknown_attribute_ignored
+                          : (unsigned)diag::err_base_specifier_attribute)
         << AL.getName();
   }
 
@@ -2867,14 +2867,14 @@
   return nullptr;
 }
 
-// Check if there is a field shadowing.

-void Sema::CheckShadowInheritedFields(const SourceLocation &Loc,

-                                      DeclarationName FieldName,

-                                      const CXXRecordDecl *RD,

-                                      bool DeclIsField) {

-  if (Diags.isIgnored(diag::warn_shadow_field, Loc))

-    return;

-

+// Check if there is a field shadowing.
+void Sema::CheckShadowInheritedFields(const SourceLocation &Loc,
+                                      DeclarationName FieldName,
+                                      const CXXRecordDecl *RD,
+                                      bool DeclIsField) {
+  if (Diags.isIgnored(diag::warn_shadow_field, Loc))
+    return;
+
   // To record a shadowed field in a base
   std::map<CXXRecordDecl*, NamedDecl*> Bases;
   auto FieldShadowed = [&](const CXXBaseSpecifier *Specifier,
@@ -2908,13 +2908,13 @@
       continue;
     auto BaseField = It->second;
     assert(BaseField->getAccess() != AS_private);
-    if (AS_none !=

-        CXXRecordDecl::MergeAccess(P.Access, BaseField->getAccess())) {

-      Diag(Loc, diag::warn_shadow_field)

-        << FieldName << RD << Base << DeclIsField;

-      Diag(BaseField->getLocation(), diag::note_shadow_field);

-      Bases.erase(It);

-    }

+    if (AS_none !=
+        CXXRecordDecl::MergeAccess(P.Access, BaseField->getAccess())) {
+      Diag(Loc, diag::warn_shadow_field)
+        << FieldName << RD << Base << DeclIsField;
+      Diag(BaseField->getLocation(), diag::note_shadow_field);
+      Bases.erase(It);
+    }
   }
 }