Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Text interface format version #20458

Merged
merged 13 commits into from
Nov 14, 2018
Merged

Text interface format version #20458

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d4e6479
Add a new ForwardingDiagnosticConsumer type.
graydon Nov 5, 2018
3aab6fd
[ModuleInterface] Use ForwardingDiagnosticConsumer in sub-instance.
graydon Nov 5, 2018
be7fcfd
[ModuleInterface] Emit error when we fail to find a dependency.
graydon Nov 5, 2018
4a4f5de
[ModuleInterface] Move module cache tests to ModuleCache subdir.
graydon Nov 5, 2018
8b0b5ad
[ModuleInterface] Suppress warnings in sub-invocation.
graydon Nov 6, 2018
37a2eb5
[ModuleInterface] Add tests for warning-suppression, errors from sub-…
graydon Nov 7, 2018
b07425a
[ModuleInterface] Switch from mtime to xxhash in FILE_DEPENDENCY reco…
graydon Nov 7, 2018
d44943a
[ModuleInterface] Include and dedupe (transitive) FILE_DEPENDENCY rec…
graydon Nov 8, 2018
8959923
[ModuleInterface] Propagate dependencies to outer DependencyTracker f…
graydon Nov 8, 2018
9d7d668
[ModuleInterface] Compensate for silly source of order variation in .…
graydon Nov 9, 2018
c6ac386
[ModuleInterface] Address review comments.
graydon Nov 9, 2018
6575431
[ModuleInterface] Version string (semi)finalization, format version c…
graydon Nov 9, 2018
74dc5a1
[ModuleInterface] Remove protected helper, redundant with visible dep…
graydon Nov 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[ModuleInterface] Emit error when we fail to find a dependency.
  • Loading branch information
@graydon
graydon committed Nov 13, 2018
commit be7fcfdc2df1b88849aa9e310c6f6a7fd8abeded
3 changes: 3 additions & 0 deletions include/swift/AST/DiagnosticsFrontend.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,9 @@ ERROR(error_extracting_version_from_parseable_interface,none,
"error extracting version from parseable module interface", ())
ERROR(error_extracting_flags_from_parseable_interface,none,
"error extracting flags from parseable module interface", ())
ERROR(missing_dependency_of_parseable_module_interface,none,
"missing dependency '%0' of parseable module interface '%1': %2",
(StringRef, StringRef, StringRef))

#ifndef DIAG_NO_UNDEF
# if defined(DIAG)
Expand Down
3 changes: 3 additions & 0 deletions lib/Frontend/ParseableInterfaceSupport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,9 @@ static bool buildSwiftModuleFromSwiftInterface(
for (auto const &Dep : DepNames) {
auto DepStatus = FS.status(Dep);
if (!DepStatus) {
Diags.diagnose(SourceLoc(),
diag::missing_dependency_of_parseable_module_interface,
Dep, InPath, DepStatus.getError().message());
SubError = true;
return;
}
Expand Down