Improve testing for re-exported modules.

Test more kinds of entities, including through serialized SIL, and
verify that other combinations work (e.g., building the overlay
against the public module but using it with the private version).

Author: DougGregor

test/ClangImporter/Inputs/privateframeworks/overlay/SomeKit.swift

@@ -1,9 +1,49 @@
 @_exported import SomeKit
+import Foundation
 
 extension SKWidget {
   public func extensionMethod() -> ExtensionType { return ExtensionType() }
 
   public struct ExtensionType { }
 }
 
+extension SKWidget.ExtensionType {
+  public func foo() { }
+}
+
+extension NSObject {
+  public func doSomethingElse(_: SKWidget) { }
+}
 
+extension SKWidgetError {
+  public func getCode(from widget: SKWidget) -> SKWidgetError.Code {
+    return widget.getCurrentError()
+  }
+}
+
+extension SKWidgetError.Code {
+  public var isBoom: Bool {
+    return self == .boom
+  }
+}
+
+public protocol HasAnObject {
+  var anObject: NSObject { get set }
+}
+
+extension SKWidget : HasAnObject { }
+
+@inline(__always)
+public func inlineWidgetOperations(_ widget: SKWidget) {
+  widget.extensionMethod().foo()
+  widget.someObjCMethod()
+  widget.someObjCExtensionMethod()
+  widget.doSomething(with: widget)
+  widget.doSomethingElse(widget)
+  let obj = widget.anObject
+  widget.anObject = obj
+  _ = SKWidgetError(.boom).getCode(from: widget).isBoom
+  var hao: HasAnObject = widget
+  someKitGlobalFunc()
+  hao.anObject = widget
+}

test/ClangImporter/Inputs/privateframeworks/withoutprivate/SomeKit.framework/Headers/SKWidget.h

@@ -1,4 +1,26 @@
 @import ObjectiveC;
 
 @interface SKWidget : NSObject
+- (void)someObjCMethod;
 @end
+
+@interface SKWidget(ObjCAPI)
+- (void)someObjCExtensionMethod;
+@property (readwrite,strong,nonnull) NSObject *anObject;
+@end
+
+@interface NSObject (SKWidget)
+- (void)doSomethingWithWidget:(nonnull SKWidget *)widget;
+@end
+
+extern NSString * _Nonnull const SKWidgetErrorDomain;
+typedef enum __attribute__((ns_error_domain(SKWidgetErrorDomain))) SKWidgetErrorCode : NSInteger {
+  SKWidgetErrorNone = 0,
+  SKWidgetErrorBoom = 1
+} SKWidgetErrorCode;
+
+@interface SKWidget(Erroneous)
+- (SKWidgetErrorCode)getCurrentError;
+@end
+
+extern void someKitGlobalFunc(void);

test/ClangImporter/Inputs/privateframeworks/withprivate/SomeKitCore.framework/Headers/SKWidget.h

@@ -1,4 +1,27 @@
 @import ObjectiveC;
+@import Foundation;
 
 @interface SKWidget : NSObject
+- (void)someObjCMethod;
 @end
+
+@interface SKWidget(ObjCAPI)
+- (void)someObjCExtensionMethod;
+@property (readwrite,strong,nonnull) NSObject *anObject;
+@end
+
+@interface NSObject (SKWidget)
+- (void)doSomethingWithWidget:(nonnull SKWidget *)widget;
+@end
+
+extern NSString * _Nonnull const SKWidgetErrorDomain;
+typedef enum __attribute__((ns_error_domain(SKWidgetErrorDomain))) SKWidgetErrorCode : NSInteger {
+  SKWidgetErrorNone = 0,
+  SKWidgetErrorBoom = 1
+} SKWidgetErrorCode;
+
+@interface SKWidget(Erroneous)
+- (SKWidgetErrorCode)getCurrentError;
+@end
+
+extern void someKitGlobalFunc(void);

test/ClangImporter/private_frameworks.swift

@@ -1,20 +1,46 @@
 // RUN: rm -rf %t
 // RUN: mkdir -p %t
 
+// FIXME: BEGIN -enable-source-import hackaround
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -emit-module -o %t %clang-importer-sdk-path/swift-modules/CoreGraphics.swift
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-module -o %t %clang-importer-sdk-path/swift-modules/Foundation.swift
+// FIXME: END -enable-source-import hackaround
+
 // Build the overlay with private frameworks.
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-module -F %S/Inputs/privateframeworks/withprivate -o %t %S/Inputs/privateframeworks/overlay/SomeKit.swift
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-module -F %S/Inputs/privateframeworks/withprivate -o %t %S/Inputs/privateframeworks/overlay/SomeKit.swift
+
+// Use the overlay with private frameworks.
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-sil -o /dev/null -F %S/Inputs/privateframeworks/withprivate %s -verify
+
+// Use the overlay without private frameworks.
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-sil -o /dev/null -F %S/Inputs/privateframeworks/withoutprivate -I %t %s
+
+// Build the overlay with public frameworks.
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-module -F %S/Inputs/privateframeworks/withoutprivate -o %t %S/Inputs/privateframeworks/overlay/SomeKit.swift
 
 // Use the overlay with private frameworks.
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -F %S/Inputs/privateframeworks/withprivate -I %t %s -verify
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-sil -o /dev/null -F %S/Inputs/privateframeworks/withprivate %s -verify
 
 // Use the overlay without private frameworks.
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -F %S/Inputs/privateframeworks/withoutprivate -I %t %s -verify
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-sil -o /dev/null -F %S/Inputs/privateframeworks/withoutprivate -I %t %s
 
 // REQUIRES: objc_interop
 
 import SomeKit
 
 func testWidget(widget: SKWidget) {
-  _ = widget.extensionMethod()
+  _ = widget.someObjCMethod()
+  _ = widget.someObjCExtensionMethod()
+
+  let ext = widget.extensionMethod()
+  ext.foo()
+
+  widget.doSomethingElse(widget)
+  inlineWidgetOperations(widget)
+}
+
+func testError(widget: SKWidget) {
+  let c: SKWidgetError.Code = SKWidgetError(.boom).getCode(from: widget)
+  if c.isBoom { }
 }