Add more tests

scentini · scentini · commit 679ce361aafa · 2020-10-29T16:55:10.000+01:00
diff --git a/lib/Sema/ResilienceDiagnostics.cpp b/lib/Sema/ResilienceDiagnostics.cpp
@@ -21,7 +21,6 @@
 #include "swift/AST/Decl.h"
 #include "swift/AST/DeclContext.h"
 #include "swift/AST/Initializer.h"
-#include "swift/AST/ModuleNameLookup.h"
 #include "swift/AST/ProtocolConformance.h"
 #include "swift/AST/SourceFile.h"
 #include "swift/AST/TypeDeclFinder.h"
diff --git a/lib/Sema/TypeCheckAccess.cpp b/lib/Sema/TypeCheckAccess.cpp
@@ -22,6 +22,7 @@
 #include "swift/AST/ASTWalker.h"
 #include "swift/AST/DiagnosticsSema.h"
 #include "swift/AST/ExistentialLayout.h"
+#include "swift/AST/ModuleNameLookup.h"
 #include "swift/AST/Pattern.h"
 #include "swift/AST/ParameterList.h"
 #include "swift/AST/TypeCheckRequests.h"
diff --git a/test/Interop/C/implementation-only-imports/lookup-visible-decls-recursively-inversed.swift b/test/Interop/C/implementation-only-imports/lookup-visible-decls-recursively-inversed.swift
@@ -1,9 +1,9 @@
 // RUN: %empty-directory(%t)
 // RUN: mkdir %t/use_module_a %t/use_module_b
-// RUN: %target-swift-frontend -enable-library-evolution -swift-version 5 -emit-module -o %t/use_module_a/UseModuleA.swiftmodule %S/Inputs/use-module-a.swift -I %S/Inputs -enable-cxx-interop
-// RUN: %target-swift-frontend -enable-library-evolution -swift-version 5 -emit-module -o %t/use_module_b/UseModuleB.swiftmodule %S/Inputs/use-module-b.swift -I %S/Inputs -enable-cxx-interop
+// RUN: %target-swift-frontend -enable-library-evolution -swift-version 5 -emit-module -o %t/use_module_a/UseModuleA.swiftmodule %S/Inputs/use-module-a.swift -I %S/Inputs
+// RUN: %target-swift-frontend -enable-library-evolution -swift-version 5 -emit-module -o %t/use_module_b/UseModuleB.swiftmodule %S/Inputs/use-module-b.swift -I %S/Inputs
 
-// RUN: %target-swift-frontend -typecheck -swift-version 5 -I %t/use_module_a -I %t/use_module_b -I %S/Inputs -enable-cxx-interop %s
+// RUN: %target-swift-frontend -typecheck -swift-version 5 -I %t/use_module_a -I %t/use_module_b -I %S/Inputs %s
 
 
 // If a decl comes from two modules, one of which is marked as
diff --git a/test/Interop/C/implementation-only-imports/lookup-visible-decls-recursively.swift b/test/Interop/C/implementation-only-imports/lookup-visible-decls-recursively.swift
@@ -1,9 +1,9 @@
 // RUN: %empty-directory(%t)
 // RUN: mkdir %t/use_module_a %t/use_module_b
-// RUN: %target-swift-frontend -enable-library-evolution -swift-version 5 -emit-module -o %t/use_module_a/UseModuleA.swiftmodule %S/Inputs/use-module-a.swift -I %S/Inputs -enable-cxx-interop
-// RUN: %target-swift-frontend -enable-library-evolution -swift-version 5 -emit-module -o %t/use_module_b/UseModuleB.swiftmodule %S/Inputs/use-module-b.swift -I %S/Inputs -enable-cxx-interop
+// RUN: %target-swift-frontend -enable-library-evolution -swift-version 5 -emit-module -o %t/use_module_a/UseModuleA.swiftmodule %S/Inputs/use-module-a.swift -I %S/Inputs
+// RUN: %target-swift-frontend -enable-library-evolution -swift-version 5 -emit-module -o %t/use_module_b/UseModuleB.swiftmodule %S/Inputs/use-module-b.swift -I %S/Inputs
 
-// RUN: %target-swift-frontend -typecheck -swift-version 5 -I %t/use_module_a -I %t/use_module_b -I %S/Inputs -enable-cxx-interop %s
+// RUN: %target-swift-frontend -typecheck -swift-version 5 -I %t/use_module_a -I %t/use_module_b -I %S/Inputs %s
 
 
 // If a decl comes from two modules, one of which is marked as
diff --git a/test/Interop/Cxx/implementation-only-imports/Inputs/decl-a.h b/test/Interop/Cxx/implementation-only-imports/Inputs/decl-a.h
@@ -0,0 +1,8 @@
+#ifndef TEST_INTEROP_CXX_IMPLEMENTATION_ONLY_IMPORTS_INPUTS_DECL_A_H
+#define TEST_INTEROP_CXX_IMPLEMENTATION_ONLY_IMPORTS_INPUTS_DECL_A_H
+
+inline int getFortySomething() {
+    return 42;
+};
+
+#endif // TEST_INTEROP_CXX_IMPLEMENTATION_ONLY_IMPORTS_INPUTS_DECL_A_H
diff --git a/test/Interop/Cxx/implementation-only-imports/Inputs/decl-b.h b/test/Interop/Cxx/implementation-only-imports/Inputs/decl-b.h
@@ -0,0 +1,8 @@
+#ifndef TEST_INTEROP_CXX_IMPLEMENTATION_ONLY_IMPORTS_INPUTS_DECL_B_H
+#define TEST_INTEROP_CXX_IMPLEMENTATION_ONLY_IMPORTS_INPUTS_DECL_B_H
+
+inline int getFortySomething() {
+    return 46;
+};
+
+#endif // TEST_INTEROP_CXX_IMPLEMENTATION_ONLY_IMPORTS_INPUTS_DECL_B_H
diff --git a/test/Interop/Cxx/implementation-only-imports/Inputs/helper.h b/test/Interop/Cxx/implementation-only-imports/Inputs/helper.h
@@ -0,0 +1,15 @@
+#ifndef TEST_INTEROP_CXX_IMPLEMENTATION_ONLY_IMPORTS_INPUTS_HELPER_H
+#define TEST_INTEROP_CXX_IMPLEMENTATION_ONLY_IMPORTS_INPUTS_HELPER_H
+
+inline int getFortyTwo() {
+    return 42;
+};
+
+class MagicWrapper {
+    int _number;
+public:
+    MagicWrapper(){};
+    MagicWrapper(int number) : _number(number) {};
+};
+
+#endif // TEST_INTEROP_CXX_IMPLEMENTATION_ONLY_IMPORTS_INPUTS_HELPER_H
diff --git a/test/Interop/Cxx/implementation-only-imports/Inputs/module.modulemap b/test/Interop/Cxx/implementation-only-imports/Inputs/module.modulemap
@@ -0,0 +1,19 @@
+module UserA {
+    header "user-a.h"
+    export *
+}
+
+module UserB {
+    header "user-b.h"
+    export *
+}
+
+module DeclA {
+    header "decl-a.h"
+    export *
+}
+
+module DeclB {
+    header "decl-b.h"
+    export *
+}
diff --git a/test/Interop/Cxx/implementation-only-imports/Inputs/use-module-a.swift b/test/Interop/Cxx/implementation-only-imports/Inputs/use-module-a.swift
@@ -0,0 +1 @@
+@_exported import UserA
diff --git a/test/Interop/Cxx/implementation-only-imports/Inputs/use-module-b.swift b/test/Interop/Cxx/implementation-only-imports/Inputs/use-module-b.swift
@@ -0,0 +1 @@
+@_exported import UserB
diff --git a/test/Interop/Cxx/implementation-only-imports/Inputs/user-a.h b/test/Interop/Cxx/implementation-only-imports/Inputs/user-a.h
@@ -0,0 +1,6 @@
+#ifndef TEST_INTEROP_CXX_IMPLEMENTATION_ONLY_IMPORTS_INPUTS_USER_A_H
+#define TEST_INTEROP_CXX_IMPLEMENTATION_ONLY_IMPORTS_INPUTS_USER_A_H
+
+#include "helper.h"
+
+#endif // TEST_INTEROP_CXX_IMPLEMENTATION_ONLY_IMPORTS_INPUTS_USER_A_H
diff --git a/test/Interop/Cxx/implementation-only-imports/Inputs/user-b.h b/test/Interop/Cxx/implementation-only-imports/Inputs/user-b.h
@@ -0,0 +1,6 @@
+#ifndef TEST_INTEROP_CXX_IMPLEMENTATION_ONLY_IMPORTS_INPUTS_USER_B_H
+#define TEST_INTEROP_CXX_IMPLEMENTATION_ONLY_IMPORTS_INPUTS_USER_B_H
+
+#include "helper.h"
+
+#endif // TEST_INTEROP_CXX_IMPLEMENTATION_ONLY_IMPORTS_INPUTS_USER_B_H
diff --git a/test/Interop/Cxx/implementation-only-imports/check-constructor-visibility.swift b/test/Interop/Cxx/implementation-only-imports/check-constructor-visibility.swift
@@ -0,0 +1,12 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module -o %t/FortyTwo.swiftmodule -I %S/Inputs %s -enable-cxx-interop
+
+// REQUIRES: SR-13785
+
+@_implementationOnly import UserA
+import UserB
+
+@_inlineable
+public func createAWrapper() {
+    let _wrapper = MagicWrapper();
+}
diff --git a/test/Interop/Cxx/implementation-only-imports/check-decls-are-identical.swift b/test/Interop/Cxx/implementation-only-imports/check-decls-are-identical.swift
@@ -0,0 +1,12 @@
+// RUN: %empty-directory(%t)
+// RUN: not %target-swift-frontend -emit-module -o %t/FortyTwo.swiftmodule -I %S/Inputs -enable-cxx-interop %s 2>&1 | %FileCheck %s
+
+@_implementationOnly import DeclA
+import DeclB
+
+@_inlineable
+public func callFortySomething() -> CInt {
+    return getFortySomething()
+}
+
+// CHECK: 'getFortySomething' has different definitions in different modules
diff --git a/test/Interop/Cxx/implementation-only-imports/lookup-visible-decls-recursively-inversed.swift b/test/Interop/Cxx/implementation-only-imports/lookup-visible-decls-recursively-inversed.swift
@@ -0,0 +1,26 @@
+// RUN: %empty-directory(%t)
+// RUN: mkdir %t/use_module_a %t/use_module_b
+// RUN: %target-swift-frontend -enable-library-evolution -swift-version 5 -emit-module -o %t/use_module_a/UseModuleA.swiftmodule %S/Inputs/use-module-a.swift -I %S/Inputs -enable-cxx-interop
+// RUN: %target-swift-frontend -enable-library-evolution -swift-version 5 -emit-module -o %t/use_module_b/UseModuleB.swiftmodule %S/Inputs/use-module-b.swift -I %S/Inputs -enable-cxx-interop
+
+// RUN: %target-swift-frontend -typecheck -swift-version 5 -I %t/use_module_a -I %t/use_module_b -I %S/Inputs -enable-cxx-interop %s
+
+
+// If a decl comes from two modules, one of which is marked as
+// @_implementationOnly, Swift may choose the @_implementationOnly source
+// and then error out due to the decl being hidden.
+
+// Swift should consider all sources for the decl and recognize that the
+// decl is not hidden behind @_implementationOnly in all modules.
+
+// This test, as well as `lookup-visible-decls-recursively.swift` checks
+// that the `getFortyTwo` decl can be found when at least one of the
+// modules is not `@_implementationOnly`.
+
+@_implementationOnly import UseModuleA
+import UseModuleB
+
+@inlinable
+public func callFortyTwo() -> CInt {
+    return getFortyTwo()
+}
diff --git a/test/Interop/Cxx/implementation-only-imports/lookup-visible-decls-recursively.swift b/test/Interop/Cxx/implementation-only-imports/lookup-visible-decls-recursively.swift
@@ -0,0 +1,26 @@
+// RUN: %empty-directory(%t)
+// RUN: mkdir %t/use_module_a %t/use_module_b
+// RUN: %target-swift-frontend -enable-library-evolution -swift-version 5 -emit-module -o %t/use_module_a/UseModuleA.swiftmodule %S/Inputs/use-module-a.swift -I %S/Inputs -enable-cxx-interop
+// RUN: %target-swift-frontend -enable-library-evolution -swift-version 5 -emit-module -o %t/use_module_b/UseModuleB.swiftmodule %S/Inputs/use-module-b.swift -I %S/Inputs -enable-cxx-interop
+
+// RUN: %target-swift-frontend -typecheck -swift-version 5 -I %t/use_module_a -I %t/use_module_b -I %S/Inputs -enable-cxx-interop %s
+
+
+// If a decl comes from two modules, one of which is marked as
+// @_implementationOnly, Swift may choose the @_implementationOnly source
+// and then error out due to the decl being hidden.
+
+// Swift should consider all sources for the decl and recognize that the
+// decl is not hidden behind @_implementationOnly in all modules.
+
+// This test, as well as `lookup-visible-decls-recursively-inversed.swift`
+// checks that the `getFortyTwo` decl can be found when at least one of the
+// modules is not `@_implementationOnly`.
+
+import UseModuleA
+@_implementationOnly import UseModuleB
+
+@inlinable
+public func callFortyTwo() -> CInt {
+    return getFortyTwo()
+}
diff --git a/test/Interop/Cxx/implementation-only-imports/prefer-a-visible-decl-over-implementation-only-decls-inversed.swift b/test/Interop/Cxx/implementation-only-imports/prefer-a-visible-decl-over-implementation-only-decls-inversed.swift
@@ -0,0 +1,22 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module -o %t/FortyTwo.swiftmodule -I %S/Inputs -enable-cxx-interop %s
+
+// If a decl comes from two modules, one of which is marked as
+// @_implementationOnly, Swift may choose the @_implementationOnly source
+// and then error out due to the decl being hidden.
+
+// Swift should consider all sources for the decl and recognize that the
+// decl is not hidden behind @_implementationOnly in all modules.
+
+// This test, as well as
+// `prefer-a-visible-decl-over-implementation-only-decls.swift`
+// checks that the `getFortyTwo` decl can be found when at least one of the
+// modules is not `@_implementationOnly`.
+
+import UserA
+@_implementationOnly import UserB
+
+@_inlineable
+public func callFortyTwo() -> CInt {
+    return getFortyTwo()
+}
diff --git a/test/Interop/Cxx/implementation-only-imports/prefer-a-visible-decl-over-implementation-only-decls.swift b/test/Interop/Cxx/implementation-only-imports/prefer-a-visible-decl-over-implementation-only-decls.swift
@@ -0,0 +1,22 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module -o %t/FortyTwo.swiftmodule -I %S/Inputs -enable-cxx-interop %s
+
+// If a decl comes from two modules, one of which is marked as
+// @_implementationOnly, Swift may choose the @_implementationOnly source
+// and then error out due to the decl being hidden.
+
+// Swift should consider all sources for the decl and recognize that the
+// decl is not hidden behind @_implementationOnly in all modules.
+
+// This test, as well as
+// `prefer-a-visible-decl-over-implementation-only-decls-inversed.swift`
+// checks that the `getFortyTwo` decl can be found when at least one of the
+// modules is not `@_implementationOnly`.
+
+@_implementationOnly import UserA
+import UserB
+
+@_inlineable
+public func callFortyTwo() -> CInt {
+    return getFortyTwo()
+}
