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

[Dependency Scanning] Disable validation of Swift dependency modules' existing pre-built candidate binary module files in the scanner, on a non-caching build.

Browse Source 
As-is, this default interferes with the incremental build machinery which conservatively assumes that binary module dependencies must cause dependents to be re-built.
This commit is contained in:
Artem Chikin
2024-07-29 17:16:54 -07:00
parent 741cd47657
commit a2dc674723
9 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/swift/AST/SearchPathOptions.h
View File

@@ -542,8 +542,9 @@ public:
/// Specify the module loading behavior of the compilation. /// Specify the module loading behavior of the compilation.
ModuleLoadingMode ModuleLoadMode = ModuleLoadingMode::PreferSerialized; ModuleLoadingMode ModuleLoadMode = ModuleLoadingMode::PreferSerialized;
/// Legacy scanner search behavior. /// New scanner search behavior. Validate up-to-date existing Swift module
bool NoScannerModuleValidation = false; /// dependencies in the scanner itself.
bool ScannerModuleValidation = false;
/// Return all module search paths that (non-recursively) contain a file whose /// Return all module search paths that (non-recursively) contain a file whose
/// name is in \p Filenames. /// name is in \p Filenames.
@@ -593,7 +594,7 @@ public:
hash_combine_range(RuntimeLibraryImportPaths.begin(), hash_combine_range(RuntimeLibraryImportPaths.begin(),
RuntimeLibraryImportPaths.end()), RuntimeLibraryImportPaths.end()),
DisableModulesValidateSystemDependencies, DisableModulesValidateSystemDependencies,
NoScannerModuleValidation, ScannerModuleValidation,
ModuleLoadMode); ModuleLoadMode);
} }

2
include/swift/Option/FrontendOptions.td
View File

@@ -1386,6 +1386,8 @@ def disable_sending_args_and_results_with_region_isolation : Flag<["-"],
HelpText<"Disable sending args and results when region based isolation is enabled. Only enabled with asserts">, HelpText<"Disable sending args and results when region based isolation is enabled. Only enabled with asserts">,
Flags<[HelpHidden]>; Flags<[HelpHidden]>;
def scanner_module_validation: Flag<["-"], "scanner-module-validation">,
HelpText<"Validate binary modules in the dependency scanner">;
def no_scanner_module_validation: Flag<["-"], "no-scanner-module-validation">, def no_scanner_module_validation: Flag<["-"], "no-scanner-module-validation">,
HelpText<"Do not validate binary modules in scanner and delegate the validation to swift-frontend">; HelpText<"Do not validate binary modules in scanner and delegate the validation to swift-frontend">;
def module_load_mode: Separate<["-"], "module-load-mode">, def module_load_mode: Separate<["-"], "module-load-mode">,

9
lib/Frontend/CompilerInvocation.cpp
View File

@@ -2005,6 +2005,7 @@ static bool validateSwiftModuleFileArgumentAndAdd(const std::string &swiftModule
static bool ParseSearchPathArgs(SearchPathOptions &Opts, ArgList &Args, static bool ParseSearchPathArgs(SearchPathOptions &Opts, ArgList &Args,
DiagnosticEngine &Diags, DiagnosticEngine &Diags,
const CASOptions &CASOpts,
StringRef workingDirectory) { StringRef workingDirectory) {
using namespace options; using namespace options;
namespace path = llvm::sys::path; namespace path = llvm::sys::path;
@@ -2148,8 +2149,10 @@ static bool ParseSearchPathArgs(SearchPathOptions &Opts, ArgList &Args,
Opts.ScannerPrefixMapper.push_back(Opt.str()); Opts.ScannerPrefixMapper.push_back(Opt.str());
} }
Opts.NoScannerModuleValidation |= // rdar://132340493 disable scanner-side validation for non-caching builds
Args.hasArg(OPT_no_scanner_module_validation); Opts.ScannerModuleValidation |= Args.hasFlag(OPT_scanner_module_validation,
OPT_no_scanner_module_validation,
CASOpts.EnableCaching);
std::optional<std::string> forceModuleLoadingMode; std::optional<std::string> forceModuleLoadingMode;
if (auto *A = Args.getLastArg(OPT_module_load_mode)) if (auto *A = Args.getLastArg(OPT_module_load_mode))
@@ -3556,7 +3559,7 @@ bool CompilerInvocation::parseArgs(
ParseSymbolGraphArgs(SymbolGraphOpts, ParsedArgs, Diags, LangOpts); ParseSymbolGraphArgs(SymbolGraphOpts, ParsedArgs, Diags, LangOpts);
if (ParseSearchPathArgs(SearchPathOpts, ParsedArgs, Diags, if (ParseSearchPathArgs(SearchPathOpts, ParsedArgs, Diags,
workingDirectory)) { CASOpts, workingDirectory)) {
return true; return true;
} }

5
lib/Frontend/ModuleInterfaceLoader.cpp
View File

@@ -1403,7 +1403,7 @@ ModuleInterfaceCheckerImpl::getCompiledModuleCandidatesForInterface(
auto validateModule = [&](StringRef modulePath) { auto validateModule = [&](StringRef modulePath) {
// Legacy behavior do not validate module. // Legacy behavior do not validate module.
if (Ctx.SearchPathOpts.NoScannerModuleValidation) if (!Ctx.SearchPathOpts.ScannerModuleValidation)
return true; return true;
// If we picked the other module already, no need to validate this one since // If we picked the other module already, no need to validate this one since
@@ -1922,8 +1922,7 @@ InterfaceSubContextDelegateImpl::InterfaceSubContextDelegateImpl(
searchPathOpts.PluginSearchOpts; searchPathOpts.PluginSearchOpts;
// Get module loading behavior options. // Get module loading behavior options.
genericSubInvocation.getSearchPathOptions().NoScannerModuleValidation = genericSubInvocation.getSearchPathOptions().ScannerModuleValidation = searchPathOpts.ScannerModuleValidation;
searchPathOpts.NoScannerModuleValidation;
genericSubInvocation.getSearchPathOptions().ModuleLoadMode = genericSubInvocation.getSearchPathOptions().ModuleLoadMode =
searchPathOpts.ModuleLoadMode; searchPathOpts.ModuleLoadMode;

2
lib/Serialization/ScanningLoaders.cpp
View File

@@ -160,7 +160,7 @@ SwiftModuleScanner::scanInterfaceFile(Twine moduleInterfacePath,
auto compiledCandidates = auto compiledCandidates =
getCompiledCandidates(Ctx, realModuleName.str(), InPath); getCompiledCandidates(Ctx, realModuleName.str(), InPath);
if (!compiledCandidates.empty() && if (!compiledCandidates.empty() &&
!Ctx.SearchPathOpts.NoScannerModuleValidation) { Ctx.SearchPathOpts.ScannerModuleValidation) {
assert(compiledCandidates.size() == 1 && assert(compiledCandidates.size() == 1 &&
"Should only have 1 candidate module"); "Should only have 1 candidate module");
auto BinaryDep = scanModuleFile(compiledCandidates[0], isFramework, auto BinaryDep = scanModuleFile(compiledCandidates[0], isFramework,

2
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -455,7 +455,7 @@ SerializedModuleLoaderBase::scanModuleFile(Twine modulePath, bool isFramework,
isRequiredOSSAModules(), Ctx.LangOpts.SDKName, isRequiredOSSAModules(), Ctx.LangOpts.SDKName,
Ctx.SearchPathOpts.DeserializedPathRecoverer, loadedModuleFile); Ctx.SearchPathOpts.DeserializedPathRecoverer, loadedModuleFile);
if (!Ctx.SearchPathOpts.NoScannerModuleValidation) { if (Ctx.SearchPathOpts.ScannerModuleValidation) {
// If failed to load, just ignore and return do not found. // If failed to load, just ignore and return do not found.
if (loadInfo.status != serialization::Status::Valid) { if (loadInfo.status != serialization::Status::Valid) {
if (Ctx.LangOpts.EnableModuleLoadingRemarks) if (Ctx.LangOpts.EnableModuleLoadingRemarks)

6
test/ScanDependencies/compiled_swift_modules.swift
View File

@@ -10,7 +10,7 @@ import Foo
// HAS_BINARY: "swiftPrebuiltExternal": "Foo" // HAS_BINARY: "swiftPrebuiltExternal": "Foo"
// HAS_NO_COMPILED-NOT: "{{.*}}Foo.swiftmodule{{.*}}.swiftmodule" // HAS_NO_COMPILED-NOT: "compiledModulePath":{{.*}}"{{.*}}Foo.swiftmodule{{.*}}.swiftmodule"
// Step 1: build swift interface and swift module side by side // Step 1: build swift interface and swift module side by side
// RUN: %target-swift-frontend -emit-module %t/Foo.swift -emit-module-path %t/Foo.swiftmodule/%target-swiftmodule-name -module-name Foo -emit-module-interface-path %t/Foo.swiftmodule/%target-swiftinterface-name // RUN: %target-swift-frontend -emit-module %t/Foo.swift -emit-module-path %t/Foo.swiftmodule/%target-swiftmodule-name -module-name Foo -emit-module-interface-path %t/Foo.swiftmodule/%target-swiftinterface-name
@@ -20,7 +20,7 @@ import Foo
// RUN: %validate-json %t/deps.json | %FileCheck %s -check-prefix=HAS_COMPILED // RUN: %validate-json %t/deps.json | %FileCheck %s -check-prefix=HAS_COMPILED
/// Check scanner picked binary dependency if not requesting raw scan output. /// Check scanner picked binary dependency if not requesting raw scan output.
// RUN: %target-swift-frontend -scan-dependencies %s -o %t/deps.json -I %t -emit-dependencies -emit-dependencies-path %t/deps.d // RUN: %target-swift-frontend -scan-dependencies %s -scanner-module-validation -o %t/deps.json -I %t -emit-dependencies -emit-dependencies-path %t/deps.d
// RUN: %validate-json %t/deps.json | %FileCheck %s -check-prefix=HAS_BINARY // RUN: %validate-json %t/deps.json | %FileCheck %s -check-prefix=HAS_BINARY
// Step 3: remove the adjacent module. // Step 3: remove the adjacent module.
@@ -38,7 +38,7 @@ import Foo
// RUN: %validate-json %t/deps.json | %FileCheck %s -check-prefix=HAS_COMPILED // RUN: %validate-json %t/deps.json | %FileCheck %s -check-prefix=HAS_COMPILED
/// Check scanner picked binary dependency if not requesting raw scan output. /// Check scanner picked binary dependency if not requesting raw scan output.
// RUN: %target-swift-frontend -scan-dependencies %s -o %t/deps.json -I %t -emit-dependencies -emit-dependencies-path %t/deps.d -sdk %t -prebuilt-module-cache-path %t/ResourceDir/%target-sdk-name/prebuilt-modules // RUN: %target-swift-frontend -scan-dependencies %s -scanner-module-validation -o %t/deps.json -I %t -emit-dependencies -emit-dependencies-path %t/deps.d -sdk %t -prebuilt-module-cache-path %t/ResourceDir/%target-sdk-name/prebuilt-modules
// RUN: %validate-json %t/deps.json | %FileCheck %s -check-prefix=HAS_BINARY // RUN: %validate-json %t/deps.json | %FileCheck %s -check-prefix=HAS_BINARY
// Step 6: update the interface file from where the prebuilt module cache was built. // Step 6: update the interface file from where the prebuilt module cache was built.

6
test/ScanDependencies/restrict-swiftmodule-to-revision.swift
View File

@@ -17,21 +17,21 @@
// RUN: -emit-module-interface-path %t/revision/Foo.swiftinterface -enable-library-evolution %t/foo.swift // RUN: -emit-module-interface-path %t/revision/Foo.swiftinterface -enable-library-evolution %t/foo.swift
// RUN: env SWIFT_DEBUG_FORCE_SWIFTMODULE_REVISION=1.0.0.0.1 \ // RUN: env SWIFT_DEBUG_FORCE_SWIFTMODULE_REVISION=1.0.0.0.1 \
// RUN: %target-swift-frontend -scan-dependencies -module-name Test -O -module-load-mode prefer-binary \ // RUN: %target-swift-frontend -scan-dependencies -scanner-module-validation -module-name Test -O -module-load-mode prefer-binary \
// RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib \ // RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib \
// RUN: %t/main.swift -o %t/deps-1.json -swift-version 5 -I %t/match // RUN: %t/main.swift -o %t/deps-1.json -swift-version 5 -I %t/match
// RUN: %FileCheck %s --check-prefix=BINARY --input-file=%t/deps-1.json // RUN: %FileCheck %s --check-prefix=BINARY --input-file=%t/deps-1.json
// RUN: env SWIFT_DEBUG_FORCE_SWIFTMODULE_REVISION=1.0.0.0.1 \ // RUN: env SWIFT_DEBUG_FORCE_SWIFTMODULE_REVISION=1.0.0.0.1 \
// RUN: %target-swift-frontend -scan-dependencies -module-name Test -O -module-load-mode prefer-binary \ // RUN: %target-swift-frontend -scan-dependencies -scanner-module-validation -module-name Test -O -module-load-mode prefer-binary \
// RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib \ // RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib \
// RUN: %t/main.swift -o %t/deps-2.json -swift-version 5 -I %t/new // RUN: %t/main.swift -o %t/deps-2.json -swift-version 5 -I %t/new
// RUN: %FileCheck %s --check-prefix=TEXTUAL --input-file=%t/deps-2.json // RUN: %FileCheck %s --check-prefix=TEXTUAL --input-file=%t/deps-2.json
// RUN: env SWIFT_DEBUG_FORCE_SWIFTMODULE_REVISION=1.0.0.0.1 \ // RUN: env SWIFT_DEBUG_FORCE_SWIFTMODULE_REVISION=1.0.0.0.1 \
// RUN: %target-swift-frontend -scan-dependencies -module-name Test -O -module-load-mode prefer-binary \ // RUN: %target-swift-frontend -scan-dependencies -scanner-module-validation -module-name Test -O -module-load-mode prefer-binary \
// RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib \ // RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib \
// RUN: %t/main.swift -o %t/deps-3.json -swift-version 5 -I %t/revision // RUN: %t/main.swift -o %t/deps-3.json -swift-version 5 -I %t/revision

12
test/ScanDependencies/testable-dependencies.swift
View File

@@ -17,7 +17,7 @@
// RUN: %t/A.swift // RUN: %t/A.swift
/// Import testable build, should use binary but no extra dependencies. /// Import testable build, should use binary but no extra dependencies.
// RUN: %target-swift-frontend -scan-dependencies -module-load-mode prefer-serialized -module-name Test %t/main.swift \ // RUN: %target-swift-frontend -scan-dependencies -scanner-module-validation -module-load-mode prefer-serialized -module-name Test %t/main.swift \
// RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib \ // RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib \
// RUN: -o %t/deps1.json -I %t/testable -swift-version 5 -Rmodule-loading // RUN: -o %t/deps1.json -I %t/testable -swift-version 5 -Rmodule-loading
// RUN: %{python} %S/../CAS/Inputs/SwiftDepsExtractor.py %t/deps1.json Test directDependencies | %FileCheck %s --check-prefix TEST1 // RUN: %{python} %S/../CAS/Inputs/SwiftDepsExtractor.py %t/deps1.json Test directDependencies | %FileCheck %s --check-prefix TEST1
@@ -26,7 +26,7 @@
// EMPTY-NOT: B // EMPTY-NOT: B
/// Import regular build, should use binary. /// Import regular build, should use binary.
// RUN: %target-swift-frontend -scan-dependencies -module-load-mode prefer-serialized -module-name Test %t/main.swift \ // RUN: %target-swift-frontend -scan-dependencies -scanner-module-validation -module-load-mode prefer-serialized -module-name Test %t/main.swift \
// RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib \ // RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib \
// RUN: -o %t/deps2.json -I %t/regular -swift-version 5 -Rmodule-loading // RUN: -o %t/deps2.json -I %t/regular -swift-version 5 -Rmodule-loading
// RUN: %{python} %S/../CAS/Inputs/SwiftDepsExtractor.py %t/deps2.json Test directDependencies | %FileCheck %s --check-prefix TEST2 // RUN: %{python} %S/../CAS/Inputs/SwiftDepsExtractor.py %t/deps2.json Test directDependencies | %FileCheck %s --check-prefix TEST2
@@ -34,7 +34,7 @@
// RUN: %{python} %S/../CAS/Inputs/SwiftDepsExtractor.py %t/deps2.json swiftPrebuiltExternal:A directDependencies | %FileCheck %s --check-prefix EMPTY --allow-empty // RUN: %{python} %S/../CAS/Inputs/SwiftDepsExtractor.py %t/deps2.json swiftPrebuiltExternal:A directDependencies | %FileCheck %s --check-prefix EMPTY --allow-empty
/// Testable import testable build, should use binary, even interface is preferred. /// Testable import testable build, should use binary, even interface is preferred.
// RUN: %target-swift-frontend -scan-dependencies -module-load-mode prefer-interface -module-name Test %t/testable.swift \ // RUN: %target-swift-frontend -scan-dependencies -scanner-module-validation -module-load-mode prefer-interface -module-name Test %t/testable.swift \
// RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib -enable-testing \ // RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib -enable-testing \
// RUN: -o %t/deps3.json -I %t/testable -I %t/internal -swift-version 5 -Rmodule-loading // RUN: -o %t/deps3.json -I %t/testable -I %t/internal -swift-version 5 -Rmodule-loading
// RUN: %{python} %S/../CAS/Inputs/SwiftDepsExtractor.py %t/deps3.json Test directDependencies | %FileCheck %s --check-prefix TEST3 // RUN: %{python} %S/../CAS/Inputs/SwiftDepsExtractor.py %t/deps3.json Test directDependencies | %FileCheck %s --check-prefix TEST3
@@ -43,7 +43,7 @@
// TEST3-A: "swift": "B" // TEST3-A: "swift": "B"
/// Testable import sees non-testable module first, keep searching. /// Testable import sees non-testable module first, keep searching.
// RUN: %target-swift-frontend -scan-dependencies -module-load-mode prefer-interface -module-name Test %t/testable.swift \ // RUN: %target-swift-frontend -scan-dependencies -scanner-module-validation -module-load-mode prefer-interface -module-name Test %t/testable.swift \
// RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib -enable-testing \ // RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib -enable-testing \
// RUN: -o %t/deps4.json -I %t/regular -I %t/testable -I %t/internal -swift-version 5 -Rmodule-loading 2>&1 | %FileCheck %s --check-prefix WARN // RUN: -o %t/deps4.json -I %t/regular -I %t/testable -I %t/internal -swift-version 5 -Rmodule-loading 2>&1 | %FileCheck %s --check-prefix WARN
// RUN: %{python} %S/../CAS/Inputs/SwiftDepsExtractor.py %t/deps4.json Test directDependencies | %FileCheck %s --check-prefix TEST4 // RUN: %{python} %S/../CAS/Inputs/SwiftDepsExtractor.py %t/deps4.json Test directDependencies | %FileCheck %s --check-prefix TEST4
@@ -52,7 +52,7 @@
// TEST4-A: "swift": "B" // TEST4-A: "swift": "B"
/// Testable import non-testable build enable testing, warning about the finding then error out. /// Testable import non-testable build enable testing, warning about the finding then error out.
// RUN: %target-swift-frontend -scan-dependencies -module-load-mode prefer-interface -module-name Test %t/testable.swift \ // RUN: %target-swift-frontend -scan-dependencies -scanner-module-validation -module-load-mode prefer-interface -module-name Test %t/testable.swift \
// RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib -enable-testing \ // RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib -enable-testing \
// RUN: -o %t/deps5.json -I %t/regular -swift-version 5 -Rmodule-loading 2>&1 | %FileCheck %s --check-prefix WARN --check-prefix ERROR // RUN: -o %t/deps5.json -I %t/regular -swift-version 5 -Rmodule-loading 2>&1 | %FileCheck %s --check-prefix WARN --check-prefix ERROR
// WARN: warning: ignore swiftmodule built without '-enable-testing' // WARN: warning: ignore swiftmodule built without '-enable-testing'
@@ -60,7 +60,7 @@
/// Regular import a testable module with no interface, don't load optional dependencies. /// Regular import a testable module with no interface, don't load optional dependencies.
// RUN: rm %t/testable/A.swiftinterface // RUN: rm %t/testable/A.swiftinterface
// RUN: %target-swift-frontend -scan-dependencies -module-load-mode prefer-interface -module-name Test %t/main.swift \ // RUN: %target-swift-frontend -scan-dependencies -scanner-module-validation -module-load-mode prefer-interface -module-name Test %t/main.swift \
// RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib -enable-testing \ // RUN: -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib -enable-testing \
// RUN: -o %t/deps6.json -I %t/testable -swift-version 5 -Rmodule-loading // RUN: -o %t/deps6.json -I %t/testable -swift-version 5 -Rmodule-loading
// RUN: %{python} %S/../CAS/Inputs/SwiftDepsExtractor.py %t/deps6.json Test directDependencies | %FileCheck %s --check-prefix TEST6 // RUN: %{python} %S/../CAS/Inputs/SwiftDepsExtractor.py %t/deps6.json Test directDependencies | %FileCheck %s --check-prefix TEST6