Skip to content

Fix .swiftsourceinfo output path when the build system provides a Project/ dir #197

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.

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

Merged
merged 1 commit into from
Aug 11, 2020

Conversation

owenv
Copy link
Contributor

@owenv owenv commented Aug 8, 2020

This fixes the remaining source info integration test (Driver/sourceinfo_file.swift)

Comment on lines -1807 to -1818
// If there is an output argument, derive the name from there.
if let outputPathArg = parsedOptions.getLastArgument(.o) {
let path = try VirtualPath(path: outputPathArg.asSingle)

// If the compiler output is of this type, use the argument directly.
if type == compilerOutputType {
return path
}

return try path.replacingExtension(with: type)
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this logic is no longer used due to improvements in the module output path computation since it was written. Removing it didn't introduce any regressions in the integration tests

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like dead code to me, thanks!

@owenv
Copy link
Contributor Author

owenv commented Aug 8, 2020

@swift-ci test Linux

@DougGregor
Copy link
Member

@swift-ci test macOS

@owenv owenv merged commit 0fc317a into swiftlang:master Aug 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants