averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #74199 from cachemeifyoucan/eng/PR-128876895

Browse Source 
[ScanDependencies] Make sure `canImport` resolution agrees with `import`
This commit is contained in:
Steven Wu
2024-06-18 09:14:19 -07:00
committed by GitHub
parent d92f181ace 7d85aa423d
commit fef4ee4935
16 changed files with 109 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/swift/AST/ASTContext.h
View File

@@ -1109,7 +1109,7 @@ public:
///
/// Note that even if this check succeeds, errors may still occur if the
/// module is loaded in full.
bool canImportModuleImpl(ImportPath::Module ModulePath,
bool canImportModuleImpl(ImportPath::Module ModulePath, SourceLoc loc,
llvm::VersionTuple version, bool underlyingVersion,
bool updateFailingList,
llvm::VersionTuple &foundVersion) const;
@@ -1146,7 +1146,7 @@ public:
///
/// Note that even if this check succeeds, errors may still occur if the
/// module is loaded in full.
bool canImportModule(ImportPath::Module ModulePath,
bool canImportModule(ImportPath::Module ModulePath, SourceLoc loc,
llvm::VersionTuple version = llvm::VersionTuple(),
bool underlyingVersion = false);

3
include/swift/AST/DiagnosticsSema.def
View File

@@ -830,6 +830,9 @@ ERROR(serialization_failed,none,
"serialization of module %0 failed due to the errors above",
(const ModuleDecl *))
WARNING(can_import_invalid_swiftmodule,none,
"canImport() evaluated to false due to invalid swiftmodule: %0", (StringRef))
ERROR(serialization_load_failed,Fatal,
"failed to load module '%0'", (StringRef))
ERROR(module_interface_build_failed,Fatal,

2
include/swift/AST/ModuleLoader.h
View File

@@ -287,7 +287,7 @@ public:
///
/// If a non-null \p versionInfo is provided, the module version will be
/// parsed and populated.
virtual bool canImportModule(ImportPath::Module named,
virtual bool canImportModule(ImportPath::Module named, SourceLoc loc,
ModuleVersionInfo *versionInfo,
bool isTestableImport = false) = 0;

2
include/swift/ClangImporter/ClangImporter.h
View File

@@ -227,7 +227,7 @@ public:
///
/// If a non-null \p versionInfo is provided, the module version will be
/// parsed and populated.
virtual bool canImportModule(ImportPath::Module named,
virtual bool canImportModule(ImportPath::Module named, SourceLoc loc,
ModuleVersionInfo *versionInfo,
bool isTestableImport = false) override;

4
include/swift/Frontend/ModuleInterfaceLoader.h
View File

@@ -163,7 +163,7 @@ class ExplicitSwiftModuleLoader: public SerializedModuleLoaderBase {
bool SkipBuildingInterface, bool IsFramework,
bool IsTestableDependencyLookup = false) override;
bool canImportModule(ImportPath::Module named,
bool canImportModule(ImportPath::Module named, SourceLoc loc,
ModuleVersionInfo *versionInfo,
bool isTestableDependencyLookup = false) override;
@@ -212,7 +212,7 @@ class ExplicitCASModuleLoader : public SerializedModuleLoaderBase {
bool SkipBuildingInterface, bool IsFramework,
bool IsTestableDependencyLookup = false) override;
bool canImportModule(ImportPath::Module named,
bool canImportModule(ImportPath::Module named, SourceLoc loc,
ModuleVersionInfo *versionInfo,
bool isTestableDependencyLookup = false) override;

7
include/swift/Sema/SourceLoader.h
View File

@@ -59,9 +59,10 @@ public:
///
/// If a non-null \p versionInfo is provided, the module version will be
/// parsed and populated.
virtual bool canImportModule(ImportPath::Module named,
ModuleVersionInfo *versionInfo,
bool isTestableDependencyLookup = false) override;
virtual bool
canImportModule(ImportPath::Module named, SourceLoc loc,
ModuleVersionInfo *versionInfo,
bool isTestableDependencyLookup = false) override;
/// Import a module with the given module path.
///

9
include/swift/Serialization/SerializedModuleLoader.h
View File

@@ -209,9 +209,10 @@ public:
///
/// If a non-null \p versionInfo is provided, the module version will be
/// parsed and populated.
virtual bool canImportModule(ImportPath::Module named,
ModuleVersionInfo *versionInfo,
bool isTestableDependencyLookup = false) override;
virtual bool
canImportModule(ImportPath::Module named, SourceLoc loc,
ModuleVersionInfo *versionInfo,
bool isTestableDependencyLookup = false) override;
/// Import a module with the given module path.
///
@@ -339,7 +340,7 @@ class MemoryBufferSerializedModuleLoader : public SerializedModuleLoaderBase {
public:
virtual ~MemoryBufferSerializedModuleLoader();
bool canImportModule(ImportPath::Module named,
bool canImportModule(ImportPath::Module named, SourceLoc loc,
ModuleVersionInfo *versionInfo,
bool isTestableDependencyLookup = false) override;