Skip to content
New issue

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

#

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

Already on GitHub? # to your account

[PackageLoading] Filter out library creation note from LINK #4313

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

[PackageLoading] Filter out library creation note from LINK #4313

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e00045b
Remove `rdar://73710910` workaround
stevapple Sep 8, 2022
cc19d07
Cache compiled manifest path for diagnostic
stevapple Sep 8, 2022
5d628f4
`LINK` library creation note is not warning
stevapple Sep 8, 2022
49482eb
Emit `LINK` note as debug-level diagnostic.
stevapple Sep 8, 2022
ca94d24
Minor update
stevapple Sep 8, 2022
012beb7
Merge remote-tracking branch 'upstream/main' into link-no-warning
stevapple Sep 9, 2022
58e661a
Explain for `FIXME` of `compilerOutput` processing
stevapple Sep 13, 2022
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
19 changes: 18 additions & 1 deletion Sources/PackageLoading/ManifestLoader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,12 +290,25 @@ public final class ManifestLoader: ManifestLoaderProtocol {
// We might have some non-fatal output (warnings/notes) from the compiler even when
// we were able to parse the manifest successfully.
if let compilerOutput = result.compilerOutput {
// FIXME: We shouldn't assume the compiler output to be a single piece. There could be combined
// output from different stages of compiling the manifest, but it's hard to distinguish them.
// A better approach might be teaching the driver to emit a structured log with context and severity.
var outputSeverity: Basics.Diagnostic.Severity = .warning
#if os(Windows)
// Filter out `LINK` note for creating manifest executable.
if let compiledManifestName = result.compiledManifestFile?.basenameWithoutExt,
!compilerOutput.contains(where: \.isNewline) {
if compilerOutput.contains("\(compiledManifestName).lib") && compilerOutput.contains("\(compiledManifestName).exp") {
outputSeverity = .debug
}
}
#endif
let metadata = result.diagnosticFile.map { diagnosticFile -> ObservabilityMetadata in
var metadata = ObservabilityMetadata()
metadata.manifestLoadingDiagnosticFile = diagnosticFile
return metadata
}
observabilityScope.emit(warning: compilerOutput, metadata: metadata)
observabilityScope.emit(severity: outputSeverity, message: compilerOutput, metadata: metadata)
}

return try ManifestJSONParser.parse(
Expand Down Expand Up @@ -580,6 +593,7 @@ public final class ManifestLoader: ManifestLoaderProtocol {
#endif
let compiledManifestFile = tmpDir.appending(component: "\(packageIdentity)-manifest\(executableSuffix)")
cmd += ["-o", compiledManifestFile.pathString]
evaluationResult.compiledManifestFile = compiledManifestFile

// Compile the manifest.
TSCBasic.Process.popen(arguments: cmd, environment: self.toolchain.swiftCompilerEnvironment, queue: callbackQueue) { result in
Expand Down Expand Up @@ -801,6 +815,9 @@ extension ManifestLoader {

extension ManifestLoader {
struct EvaluationResult: Codable {
/// The path to the compiled manifest.
var compiledManifestFile: AbsolutePath?

/// The path to the diagnostics file (.dia).
///
/// This is only present if serialized diagnostics are enabled.
Expand Down