Silence "comparison between signed and unsigned integer expressions" warnings.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@120897 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/AST/DeclTemplate.h b/include/clang/AST/DeclTemplate.h
index 9d743200c02c5070ff8a693657a208027aa3be20..a7d0f51d6ab7fd2bce513072b16fe2d73f6c7131 100644 (file)
--- a/include/clang/AST/DeclTemplate.h
+++ b/include/clang/AST/DeclTemplate.h
@@ -1241,7 +1241,7 @@ public:
   }
 
   void setSpecializationKind(TemplateSpecializationKind TSK) {
-    if (SpecializationKind != TSK)
+    if (getSpecializationKind() != TSK)
       ClearLinkageAndVisibilityCache();
     SpecializationKind = TSK;
   }

diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 76d67bca1a0177b791d37302281824b605740a69..ce76cfb6bb8526a7a16739a1b82c7c463d2b7f44 100644 (file)
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -531,9 +531,9 @@ LinkageInfo NamedDecl::getLinkageAndVisibility() const {
   if (HasLinkageAndVisibilityCached) {
 #ifndef NDEBUG
     LinkageInfo LI = getLVForDecl(this, LVFlags());
-    assert(LI.visibility() == CachedVisibility);
+    assert(LI.visibility() == Visibility(CachedVisibility));
     assert(LI.visibilityExplicit() == CachedVisibilityIsExplicit);
-    assert(LI.linkage() == CachedLinkage);
+    assert(LI.linkage() == Linkage(CachedLinkage));
 #endif
     return LinkageInfo(Linkage(CachedLinkage), Visibility(CachedVisibility),
                        CachedVisibilityIsExplicit);
@@ -930,7 +930,7 @@ VarDecl *VarDecl::Create(ASTContext &C, DeclContext *DC, SourceLocation L,
 
 void VarDecl::setStorageClass(StorageClass SC) {
   assert(isLegalForVariable(SC));
-  if (SClass != SC)
+  if (getStorageClass() != SC)
     ClearLinkageAndVisibilityCache();
   
   SClass = SC;
@@ -1341,7 +1341,7 @@ FunctionDecl *FunctionDecl::getCanonicalDecl() {
 
 void FunctionDecl::setStorageClass(StorageClass SC) {
   assert(isLegalForFunction(SC));
-  if (SClass != SC)
+  if (getStorageClass() != SC)
     ClearLinkageAndVisibilityCache();
   
   SClass = SC;