vendor/clang/clang-trunk-r306325

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/AST/DeclBase.cpp b/lib/AST/DeclBase.cpp
index 032a20afa834..a0594a020362 100644
--- a/lib/AST/DeclBase.cpp
+++ b/lib/AST/DeclBase.cpp
@@ -278,12 +278,12 @@ void Decl::setLexicalDeclContext(DeclContext *DC) {
   // FIXME: We shouldn't be changing the lexical context of declarations
   // imported from AST files.
   if (!isFromASTFile()) {
-    Hidden = cast<Decl>(DC)->Hidden && hasLocalOwningModuleStorage();
-    if (Hidden)
+    setModuleOwnershipKind(getModuleOwnershipKindForChildOf(DC));
+    if (hasOwningModule())
       setLocalOwningModule(cast<Decl>(DC)->getOwningModule());
   }
 
-  assert((!Hidden || getOwningModule()) &&
+  assert((!hasOwningModule() || getOwningModule()) &&
          "hidden declaration has no owning module");
 }
 
@@ -1352,7 +1352,7 @@ void DeclContext::removeDecl(Decl *D) {
     // Remove only decls that have a name
     if (!ND->getDeclName()) return;
 
-    auto *DC = this;
+    auto *DC = D->getDeclContext();
     do {
       StoredDeclsMap *Map = DC->getPrimaryContext()->LookupPtr;
       if (Map) {