---

yaml
---
r: 349467
b: refs/heads/master-next
c: ad686b6
h: refs/heads/master
i:
  349465: b9739cd
  349463: 7376821

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 24abf3fea763fe4b621aad4c129110e5e1b9c0b0
+refs/heads/master-next: ad686b6a7e684e821aa48b1963550ddc3fa24800
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/include/swift/ClangImporter/ClangImporter.h

@@ -88,7 +88,9 @@ class DWARFImporterDelegate {
   virtual ~DWARFImporterDelegate() = default;
   /// Perform a qualified lookup of a Clang type with this name.
   /// \param kind  Only return results with this type kind.
+  /// \param inModule only return results from this module.
   virtual void lookupValue(StringRef name, llvm::Optional<ClangTypeKind> kind,
+                           StringRef inModule,
                            SmallVectorImpl<clang::Decl *> &results) {}
   /// vtable anchor.
   virtual void anchor();

branches/master-next/lib/ClangImporter/DWARFImporter.cpp

@@ -21,11 +21,11 @@ void DWARFImporterDelegate::anchor() {}
 /// loading of types is done on demand, this class is effectively empty.
 class DWARFModuleUnit final : public LoadedFile {
   ~DWARFModuleUnit() = default;
-  ClangImporter::Implementation &owner;
+  ClangImporter::Implementation &Owner;
 
 public:
   DWARFModuleUnit(ModuleDecl &M, ClangImporter::Implementation &owner)
-      : LoadedFile(FileUnitKind::DWARFModule, M), owner(owner) {}
+      : LoadedFile(FileUnitKind::DWARFModule, M), Owner(owner) {}
 
   virtual bool isSystemModule() const override { return false; }
 
@@ -35,7 +35,8 @@ class DWARFModuleUnit final : public LoadedFile {
   lookupValue(ModuleDecl::AccessPathTy accessPath, DeclName name,
               NLKind lookupKind,
               SmallVectorImpl<ValueDecl *> &results) const override {
-    owner.lookupValueDWARF(accessPath, name, lookupKind, results);
+    Owner.lookupValueDWARF(accessPath, name, lookupKind,
+                           getParentModule()->getName(), results);
   }
 
   virtual TypeDecl *
@@ -110,7 +111,7 @@ ModuleDecl *ClangImporter::Implementation::loadModuleDWARF(
   auto *decl = ModuleDecl::create(name, SwiftContext);
   decl->setIsNonSwiftModule();
   decl->setHasResolvedImports();
-  auto wrapperUnit = new (SwiftContext) DWARFModuleUnit(*decl, *this);
+  auto *wrapperUnit = new (SwiftContext) DWARFModuleUnit(*decl, *this);
   DWARFModuleUnits.insert({name, wrapperUnit});
   decl->addFile(*wrapperUnit);
 
@@ -127,7 +128,7 @@ ModuleDecl *ClangImporter::Implementation::loadModuleDWARF(
 
 void ClangImporter::Implementation::lookupValueDWARF(
     ModuleDecl::AccessPathTy accessPath, DeclName name, NLKind lookupKind,
-    SmallVectorImpl<ValueDecl *> &results) {
+    Identifier inModule, SmallVectorImpl<ValueDecl *> &results) {
   if (!swift::ModuleDecl::matchesAccessPath(accessPath, name))
     return;
 
@@ -138,7 +139,8 @@ void ClangImporter::Implementation::lookupValueDWARF(
     return;
 
   SmallVector<clang::Decl *, 4> decls;
-  DWARFImporter->lookupValue(name.getBaseIdentifier().str(), None, decls);
+  DWARFImporter->lookupValue(name.getBaseIdentifier().str(), None,
+                             inModule.str(), decls);
   for (auto *clangDecl : decls) {
     auto *namedDecl = dyn_cast<clang::NamedDecl>(clangDecl);
     if (!namedDecl)
@@ -160,8 +162,9 @@ void ClangImporter::Implementation::lookupTypeDeclDWARF(
   if (!DWARFImporter)
     return;
 
+  /// This function is invoked by ASTDemangler, which doesn't filter by module.
   SmallVector<clang::Decl *, 1> decls;
-  DWARFImporter->lookupValue(rawName, kind, decls);
+  DWARFImporter->lookupValue(rawName, kind, {}, decls);
   for (auto *clangDecl : decls) {
     if (!isa<clang::TypeDecl>(clangDecl) &&
         !isa<clang::ObjCContainerDecl>(clangDecl) &&

branches/master-next/lib/ClangImporter/ImporterImpl.h

@@ -1324,8 +1324,9 @@ class LLVM_LIBRARY_VISIBILITY ClangImporter::Implementation
 
   /// Look for namespace-scope values with the given name using the
   /// DWARFImporterDelegate.
+  /// \param inModule only return results from this module.
   void lookupValueDWARF(ModuleDecl::AccessPathTy accessPath, DeclName name,
-                        NLKind lookupKind,
+                        NLKind lookupKind, Identifier inModule,
                         SmallVectorImpl<ValueDecl *> &results);
 
   /// Look for top-level scope types with a name and kind using the