Merge branch 'swift-4.0-branch-06-23-2017' into record-conformance-in-source-file-4.0jun23

Author: DougGregor

lib/ClangImporter/ImportDecl.cpp

@@ -7907,8 +7907,9 @@ ClangImporter::Implementation::loadAllMembers(Decl *D, uint64_t extra) {
     for (auto entry : table->lookupGlobalsAsMembers(effectiveClangContext)) {
       auto decl = entry.get<clang::NamedDecl *>();
 
-      // Only continue members in the same submodule as this extension.
-      if (decl->getImportedOwningModule() != submodule) continue;
+      // Only include members in the same submodule as this extension.
+      if (getClangSubmoduleForDecl(decl) != submodule)
+        continue;
 
       forEachDistinctName(decl, [&](ImportedName newName,
                                     ImportNameVersion nameVersion) {

test/ClangImporter/Inputs/frameworks/ImportAsMemberSubmodules.framework/Headers/Actual.h

@@ -0,0 +1,3 @@
+struct IAMOuter { int x; };
+
+struct IAMInner { int y; };

test/ClangImporter/Inputs/frameworks/ImportAsMemberSubmodules.framework/Headers/Fwd.h

@@ -0,0 +1,3 @@
+// The order of these forward-declarations affects whether there was a bug.
+struct IAMOuter;
+struct IAMInner;

test/ClangImporter/Inputs/frameworks/ImportAsMemberSubmodules.framework/Headers/ImportAsMemberSubmodules.apinotes

@@ -0,0 +1,4 @@
+Name: ImportAsMemberSubmodules
+Tags:
+- Name: IAMInner
+  SwiftName: IAMOuter.Inner

test/ClangImporter/Inputs/frameworks/ImportAsMemberSubmodules.framework/Headers/ImportAsMemberSubmodules.h

@@ -0,0 +1,3 @@
+// Umbrella header.
+#import <ImportAsMemberSubmodules/Fwd.h>
+#import <ImportAsMemberSubmodules/Actual.h>

test/ClangImporter/Inputs/frameworks/ImportAsMemberSubmodules.framework/Modules/module.modulemap

@@ -0,0 +1,5 @@
+framework module ImportAsMemberSubmodules {
+  umbrella header "ImportAsMemberSubmodules.h"
+  export *
+  module * { export * }
+}

test/ClangImporter/import-as-member.swift

@@ -0,0 +1,5 @@
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -F %S/Inputs/frameworks %s -verify
+
+import ImportAsMemberSubmodules
+
+let _: IAMOuter.Inner?