Simplify. NFC.

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

diff --git a/lib/Sema/SemaLookup.cpp b/lib/Sema/SemaLookup.cpp
index 044a3aaa4bb36c96b96542a9f6c9d048c97191a1..7f9d22d3027412f30ec435b0b5aef9a5f53aff8c 100644 (file)
--- a/lib/Sema/SemaLookup.cpp
+++ b/lib/Sema/SemaLookup.cpp
@@ -1339,7 +1339,7 @@ Module *Sema::getOwningModule(Decl *Entity) {
     // instance, maybe this is a lazily-declared special member of an imported
     // class).
     auto *Parent = cast<NamedDecl>(Entity->getDeclContext());
-    assert(Parent->isHidden() && "unexpectedly hidden decl");
+    assert(!Parent->isHidden() && "unexpectedly hidden decl");
     return getOwningModule(Parent);
   }
 

diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp
index d686798be13ce39580b36a201d05196fde5c7627..cc8f56b4c55c0778af6f70229c90170fc431b151 100644 (file)
--- a/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -4125,17 +4125,17 @@ void Sema::InstantiateVariableDefinition(SourceLocation PointOfInstantiation,
   // unit.
   if (!Def) {
     if (DefinitionRequired) {
-      if (VarSpec)
+      if (VarSpec) {
         Diag(PointOfInstantiation,
              diag::err_explicit_instantiation_undefined_var_template) << Var;
+        Var->setInvalidDecl();
+      }
       else
         Diag(PointOfInstantiation,
              diag::err_explicit_instantiation_undefined_member)
             << 2 << Var->getDeclName() << Var->getDeclContext();
       Diag(PatternDecl->getLocation(),
            diag::note_explicit_instantiation_here);
-      if (VarSpec)
-        Var->setInvalidDecl();
     } else if (Var->getTemplateSpecializationKind()
                  == TSK_ExplicitInstantiationDefinition) {
       PendingInstantiations.push_back(