Test cross-import overlays

beccadax · beccadax · commit 0ab823801c47 · 2020-02-18T11:08:36.000-08:00
diff --git a/test/CrossImport/Inputs/lib-templates/Frameworks/ClangFramework.framework/Headers/ClangFramework.h b/test/CrossImport/Inputs/lib-templates/Frameworks/ClangFramework.framework/Headers/ClangFramework.h
@@ -0,0 +1 @@
+void fromClangFramework();
diff --git a/test/CrossImport/Inputs/lib-templates/Frameworks/ClangFramework.framework/Modules/ClangFramework.swiftcrossimport/AlwaysImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/Frameworks/ClangFramework.framework/Modules/ClangFramework.swiftcrossimport/AlwaysImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _AlwaysImportedOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/Frameworks/ClangFramework.framework/Modules/ClangFramework.swiftcrossimport/NeverImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/Frameworks/ClangFramework.framework/Modules/ClangFramework.swiftcrossimport/NeverImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _NeverImportedOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/Frameworks/ClangFramework.framework/Modules/ClangFramework.swiftcrossimport/badarch-badvendor-bados/AlwaysImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/Frameworks/ClangFramework.framework/Modules/ClangFramework.swiftcrossimport/badarch-badvendor-bados/AlwaysImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _NeverImportedOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/Frameworks/ClangFramework.framework/Modules/ClangFramework.swiftcrossimport/module-triple-here/AlwaysImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/Frameworks/ClangFramework.framework/Modules/ClangFramework.swiftcrossimport/module-triple-here/AlwaysImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _AlwaysImportedPlatformOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/Frameworks/ClangFramework.framework/Modules/module.modulemap b/test/CrossImport/Inputs/lib-templates/Frameworks/ClangFramework.framework/Modules/module.modulemap
@@ -0,0 +1 @@
+framework module ClangFramework { umbrella header "ClangFramework.h" }
diff --git a/test/CrossImport/Inputs/lib-templates/Frameworks/OverlaidClangFramework.framework/Headers/OverlaidClangFramework.h b/test/CrossImport/Inputs/lib-templates/Frameworks/OverlaidClangFramework.framework/Headers/OverlaidClangFramework.h
@@ -0,0 +1 @@
+void fromOverlaidClangFramework();
diff --git a/test/CrossImport/Inputs/lib-templates/Frameworks/OverlaidClangFramework.framework/Modules/OverlaidClangFramework.swiftcrossimport/AlwaysImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/Frameworks/OverlaidClangFramework.framework/Modules/OverlaidClangFramework.swiftcrossimport/AlwaysImported.swiftoverlay
@@ -0,0 +1,6 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  # use Platform to test the underlying module's cross-imports are loaded
+  - name: _AlwaysImportedPlatformOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/Frameworks/OverlaidClangFramework.framework/Modules/OverlaidClangFramework.swiftcrossimport/NeverImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/Frameworks/OverlaidClangFramework.framework/Modules/OverlaidClangFramework.swiftcrossimport/NeverImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _NeverImportedOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/Frameworks/OverlaidClangFramework.framework/Modules/module.modulemap b/test/CrossImport/Inputs/lib-templates/Frameworks/OverlaidClangFramework.framework/Modules/module.modulemap
@@ -0,0 +1 @@
+framework module OverlaidClangFramework { umbrella header "OverlaidClangFramework.h" }
diff --git a/test/CrossImport/Inputs/lib-templates/Frameworks/SwiftFramework.framework/Modules/SwiftFramework.swiftcrossimport/AlwaysImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/Frameworks/SwiftFramework.framework/Modules/SwiftFramework.swiftcrossimport/AlwaysImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _AlwaysImportedOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/Frameworks/SwiftFramework.framework/Modules/SwiftFramework.swiftcrossimport/NeverImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/Frameworks/SwiftFramework.framework/Modules/SwiftFramework.swiftcrossimport/NeverImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _NeverImportedOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/Frameworks/SwiftFramework.framework/Modules/SwiftFramework.swiftcrossimport/badarch-badvendor-bados/AlwaysImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/Frameworks/SwiftFramework.framework/Modules/SwiftFramework.swiftcrossimport/badarch-badvendor-bados/AlwaysImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _NeverImportedOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/Frameworks/SwiftFramework.framework/Modules/SwiftFramework.swiftcrossimport/module-triple-here/AlwaysImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/Frameworks/SwiftFramework.framework/Modules/SwiftFramework.swiftcrossimport/module-triple-here/AlwaysImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _AlwaysImportedPlatformOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/Frameworks/SwiftFramework.framework/Modules/SwiftFramework.swiftmodule/module-triple-here.swiftinterface b/test/CrossImport/Inputs/lib-templates/Frameworks/SwiftFramework.framework/Modules/SwiftFramework.swiftmodule/module-triple-here.swiftinterface
@@ -0,0 +1,6 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -swift-version 5 -enable-library-evolution -module-name SwiftFramework
+
+import Swift
+
+public func fromSwiftFramework()
diff --git a/test/CrossImport/Inputs/lib-templates/include/ClangLibrary.swiftcrossimport/AlwaysImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/include/ClangLibrary.swiftcrossimport/AlwaysImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _AlwaysImportedOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/include/ClangLibrary.swiftcrossimport/NeverImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/include/ClangLibrary.swiftcrossimport/NeverImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _NeverImportedOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/include/ClangLibrary.swiftcrossimport/badarch-badvendor-bados/AlwaysImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/include/ClangLibrary.swiftcrossimport/badarch-badvendor-bados/AlwaysImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _NeverImportedOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/include/ClangLibrary.swiftcrossimport/module-triple-here/AlwaysImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/include/ClangLibrary.swiftcrossimport/module-triple-here/AlwaysImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _AlwaysImportedPlatformOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/include/clang_library.h b/test/CrossImport/Inputs/lib-templates/include/clang_library.h
@@ -0,0 +1 @@
+void fromClangLibrary();
diff --git a/test/CrossImport/Inputs/lib-templates/include/module.modulemap b/test/CrossImport/Inputs/lib-templates/include/module.modulemap
@@ -0,0 +1 @@
+module ClangLibrary { header "clang_library.h" }
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/AlwaysImported.swiftinterface b/test/CrossImport/Inputs/lib-templates/lib/swift/AlwaysImported.swiftinterface
@@ -0,0 +1,7 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -swift-version 5 -enable-library-evolution -module-name AlwaysImported
+
+import Swift
+
+public func fromAlwaysImported()
+
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/BystandingLibrary.swiftinterface b/test/CrossImport/Inputs/lib-templates/lib/swift/BystandingLibrary.swiftinterface
@@ -0,0 +1,7 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -swift-version 5 -enable-library-evolution -module-name BystandingLibrary -enable-private-imports
+
+import Swift
+
+public struct BystandingLibraryTy {}
+
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/DeclaringLibrary.swiftcrossimport/BystandingLibrary.swiftoverlay b/test/CrossImport/Inputs/lib-templates/lib/swift/DeclaringLibrary.swiftcrossimport/BystandingLibrary.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _OverlayLibrary
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/DeclaringLibrary.swiftinterface b/test/CrossImport/Inputs/lib-templates/lib/swift/DeclaringLibrary.swiftinterface
@@ -0,0 +1,7 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -swift-version 5 -enable-library-evolution -module-name DeclaringLibrary -enable-private-imports
+
+import Swift
+
+public struct DeclaringLibraryTy {}
+public struct ShadowTy {}
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/FatLibrary.swiftcrossimport/AlwaysImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/lib/swift/FatLibrary.swiftcrossimport/AlwaysImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _AlwaysImportedOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/FatLibrary.swiftcrossimport/NeverImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/lib/swift/FatLibrary.swiftcrossimport/NeverImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _NeverImportedOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/FatLibrary.swiftcrossimport/badarch-badvendor-bados/AlwaysImported.yaml b/test/CrossImport/Inputs/lib-templates/lib/swift/FatLibrary.swiftcrossimport/badarch-badvendor-bados/AlwaysImported.yaml
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _NeverImportedOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/FatLibrary.swiftcrossimport/module-triple-here/AlwaysImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/lib/swift/FatLibrary.swiftcrossimport/module-triple-here/AlwaysImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _AlwaysImportedPlatformOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/FatLibrary.swiftmodule/module-triple-here.swiftinterface b/test/CrossImport/Inputs/lib-templates/lib/swift/FatLibrary.swiftmodule/module-triple-here.swiftinterface
@@ -0,0 +1,6 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -swift-version 5 -enable-library-evolution -module-name FatLibrary
+
+import Swift
+
+public func fromFatLibrary()
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/MI6.swiftinterface b/test/CrossImport/Inputs/lib-templates/lib/swift/MI6.swiftinterface
@@ -0,0 +1,5 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -swift-version 5 -enable-library-evolution -module-name MI6
+
+import Swift
+@_exported import NeverImported
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/NeverImported.swiftcrossimport/AlwaysImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/lib/swift/NeverImported.swiftcrossimport/AlwaysImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _NeverImportedOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/NeverImported.swiftcrossimport/module-triple-here/AlwaysImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/lib/swift/NeverImported.swiftcrossimport/module-triple-here/AlwaysImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _NeverImportedOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/NeverImported.swiftinterface b/test/CrossImport/Inputs/lib-templates/lib/swift/NeverImported.swiftinterface
@@ -0,0 +1,6 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -swift-version 5 -enable-library-evolution -module-name NeverImported
+
+import Swift
+
+public func fromNeverImported()
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/OverlaidClangFramework.swiftcrossimport/AlwaysImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/lib/swift/OverlaidClangFramework.swiftcrossimport/AlwaysImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _AlwaysImportedOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/OverlaidClangFramework.swiftcrossimport/NeverImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/lib/swift/OverlaidClangFramework.swiftcrossimport/NeverImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _NeverImportedOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/OverlaidClangFramework.swiftmodule/module-triple-here.swiftinterface b/test/CrossImport/Inputs/lib-templates/lib/swift/OverlaidClangFramework.swiftmodule/module-triple-here.swiftinterface
@@ -0,0 +1,5 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -swift-version 5 -enable-library-evolution -module-name OverlaidClangFramework
+
+import Swift
+@_exported import OverlaidClangFramework
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/ThinLibrary.swiftcrossimport/AlwaysImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/lib/swift/ThinLibrary.swiftcrossimport/AlwaysImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _AlwaysImportedOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/ThinLibrary.swiftcrossimport/NeverImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/lib/swift/ThinLibrary.swiftcrossimport/NeverImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _NeverImportedOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/ThinLibrary.swiftcrossimport/badarch-badvendor-bados/AlwaysImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/lib/swift/ThinLibrary.swiftcrossimport/badarch-badvendor-bados/AlwaysImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _NeverImportedOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/ThinLibrary.swiftcrossimport/module-triple-here/AlwaysImported.swiftoverlay b/test/CrossImport/Inputs/lib-templates/lib/swift/ThinLibrary.swiftcrossimport/module-triple-here/AlwaysImported.swiftoverlay
@@ -0,0 +1,5 @@
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _AlwaysImportedPlatformOverlay
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/ThinLibrary.swiftinterface b/test/CrossImport/Inputs/lib-templates/lib/swift/ThinLibrary.swiftinterface
@@ -0,0 +1,6 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -swift-version 5 -enable-library-evolution -module-name ThinLibrary
+
+import Swift
+
+public func fromThinLibrary()
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/UniversalExports.swiftinterface b/test/CrossImport/Inputs/lib-templates/lib/swift/UniversalExports.swiftinterface
@@ -0,0 +1,7 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -swift-version 5 -enable-library-evolution -module-name UniversalExports
+
+import Swift
+@_exported import AlwaysImported
+import NeverImported
+import MI6    // @_exported imports NeverImported
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/_AlwaysImportedPlatformOverlay.swiftinterface b/test/CrossImport/Inputs/lib-templates/lib/swift/_AlwaysImportedPlatformOverlay.swiftinterface
@@ -0,0 +1,7 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -swift-version 5 -enable-library-evolution -module-name _AlwaysImportedPlatformOverlay
+
+import Swift
+import AlwaysImported
+
+public func fromAlwaysImportedPlatformOverlay()
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/_NeverImportedOverlay.swiftinterface b/test/CrossImport/Inputs/lib-templates/lib/swift/_NeverImportedOverlay.swiftinterface
@@ -0,0 +1,7 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -swift-version 5 -enable-library-evolution -module-name _NeverImportedOverlay
+
+import Swift
+import NeverImported
+
+public func fromNeverImportedOverlay()
diff --git a/test/CrossImport/Inputs/lib-templates/lib/swift/_OverlayLibrary.swiftinterface b/test/CrossImport/Inputs/lib-templates/lib/swift/_OverlayLibrary.swiftinterface
@@ -0,0 +1,13 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -swift-version 5 -enable-library-evolution -module-name _OverlayLibrary
+
+import Swift
+@_exported import DeclaringLibrary
+import BystandingLibrary
+
+public struct OverlayLibraryTy {
+  public func x() -> DeclaringLibrary.DeclaringLibraryTy
+  public func y() -> BystandingLibrary.BystandingLibraryTy
+}
+
+public struct ShadowTy {}
diff --git a/test/CrossImport/Inputs/rewrite-module-triples.py b/test/CrossImport/Inputs/rewrite-module-triples.py
@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+"""
+Renames files or directories with "module-triple-here" in their names to use
+the indicated module triples instead.
+"""
+
+from __future__ import print_function
+
+import os
+import shutil
+import sys
+
+if len(sys.argv) < 3:
+    print('Too few args to ' + sys.argv[0])
+    print('Usage: rewrite-module-triples.py <root-dir> <module-triple>...')
+    sys.exit(1)
+
+root_dir = sys.argv[1]
+triples = sys.argv[2:]
+
+
+def rewritten_names(name):
+    if 'module-triple-here' not in name:
+        return []
+
+    return [name.replace('module-triple-here', triple) for triple in triples]
+
+
+def rewrite(parent, names, copy_fn, rm_fn):
+    for name in names:
+        new_names = rewritten_names(name)
+        if not new_names:
+            continue
+
+        path = os.path.join(parent, name)
+
+        for new_name in new_names:
+            new_path = os.path.join(parent, new_name)
+            copy_fn(path, new_path)
+
+        rm_fn(path)
+
+
+for parent, dirs, files in os.walk(root_dir, topdown=False):
+    rewrite(parent, dirs, shutil.copytree, shutil.rmtree)
+    rewrite(parent, files, shutil.copyfile, os.remove)
diff --git a/test/CrossImport/loading.swift b/test/CrossImport/loading.swift
diff --git a/test/CrossImport/module-interface.swift b/test/CrossImport/module-interface.swift
diff --git a/test/CrossImport/module-trace.swift b/test/CrossImport/module-trace.swift
diff --git a/test/CrossImport/negative.swift b/test/CrossImport/negative.swift
diff --git a/test/CrossImport/scoped.swift b/test/CrossImport/scoped.swift
diff --git a/test/CrossImport/transitive.swift b/test/CrossImport/transitive.swift

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+framework module ClangFramework { umbrella header "ClangFramework.h" }`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+framework module OverlaidClangFramework { umbrella header "OverlaidClangFramework.h" }`