1 files changed, 3 insertions, 5 deletions
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index d4cffb9b68..1861c8c9b6 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -535,10 +535,8 @@ static LinkageInfo getLVForClassMember(const NamedDecl *D, LVFlags F) {
 
 Linkage NamedDecl::getLinkage() const {
   if (HasCachedLinkage) {
-#ifndef NDEBUG
-    assert(CachedLinkage == getLVForDecl(this, 
-                                  LVFlags::CreateOnlyDeclLinkage()).linkage());
-#endif
+    assert(Linkage(CachedLinkage) ==
+             getLVForDecl(this, LVFlags::CreateOnlyDeclLinkage()).linkage());
     return Linkage(CachedLinkage);
   }
 
@@ -550,7 +548,7 @@ Linkage NamedDecl::getLinkage() const {
 
 LinkageInfo NamedDecl::getLinkageAndVisibility() const {
   LinkageInfo LI = getLVForDecl(this, LVFlags());
-  assert(!HasCachedLinkage || (CachedLinkage == LI.linkage()));
+  assert(!HasCachedLinkage || Linkage(CachedLinkage) == LI.linkage());
   HasCachedLinkage = 1;
   CachedLinkage = LI.linkage();
   return LI;