From e5fe5e98e5d61e5bb610fd03abd644dc286c079f Mon Sep 17 00:00:00 2001
From: Vassil Vassilev <v.g.vassilev@gmail.com>
Date: Tue, 13 Sep 2016 10:36:12 +0000
Subject: [PATCH] Simplify. NFC.

llvm-svn: 281315
---
 clang/lib/Sema/SemaLookup.cpp                  | 2 +-
 clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/clang/lib/Sema/SemaLookup.cpp b/clang/lib/Sema/SemaLookup.cpp
index 044a3aa..7f9d22d 100644
--- a/clang/lib/Sema/SemaLookup.cpp
+++ b/clang/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/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index d686798..cc8f56b 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/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(
-- 
2.7.4