[ClangImporter] Test for not being in a module correctly.

lib/ClangImporter/ImportDecl.cpp

@@ -1768,10 +1768,10 @@ shouldSuppressGenericParamsImport(const LangOptions &langOpts,
   // the SwiftImportAsNonGeneric API note. Once we can guarantee that that
   // attribute is present in all contexts, we can remove this check.
   auto isFromFoundationModule = [](const clang::Decl *decl) -> bool {
-    Optional<clang::Module *> module = getClangSubmoduleForDecl(decl);
+    clang::Module *module = getClangSubmoduleForDecl(decl).getValue();
     if (!module)
       return false;
-    return module.getValue()->getTopLevelModuleName() == "Foundation";
+    return module->getTopLevelModuleName() == "Foundation";
   };
 
   if (langOpts.isSwiftVersion3() || isFromFoundationModule(decl)) {

test/ClangImporter/MixedSource/Inputs/mixed-target/header.h

@@ -75,3 +75,8 @@ typedef int NameInCategory;
 @interface ClassThatHasAProtocolTypedPropertyButMembersAreNeverLoaded
 @property (weak) id <ForwardProtoFromOtherFile> weakProtoProp;
 @end
+
+
+@interface GenericObjCClass<Param : id <ForwardProto>> : Base
+- (instancetype)init;
+@end

test/ClangImporter/MixedSource/mixed-target-using-header-swift4.swift

@@ -0,0 +1,4 @@
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/../Inputs/custom-modules -import-objc-header %S/Inputs/mixed-target/header.h -typecheck -primary-file %S/mixed-target-using-header.swift %S/Inputs/mixed-target/other-file.swift -disable-objc-attr-requires-foundation-module -verify -swift-version 4
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/../Inputs/custom-modules -import-objc-header %S/Inputs/mixed-target/header.h -emit-sil -primary-file %S/mixed-target-using-header.swift %S/Inputs/mixed-target/other-file.swift -disable-objc-attr-requires-foundation-module -o /dev/null -D SILGEN -swift-version 4
+
+// REQUIRES: objc_interop

test/ClangImporter/MixedSource/mixed-target-using-header.swift

@@ -75,6 +75,11 @@ func testProtocolNamingConflict() {
   d = c // expected-error {{cannot assign value of type 'ConflictingName2?' to type 'ConflictingName2Protocol?'}}
   _ = d
 }
+
+func testObjCGenerics() {
+  _ = GenericObjCClass<ForwardProtoAdopter>()
+  _ = GenericObjCClass<Base>() // expected-error {{type 'Base' does not conform to protocol 'ForwardProto'}}
+}
 #endif
 
 func testDeclsNestedInObjCContainers() {