Skip to content

Support module wrapping for debugging on Linux #199

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 9, 2020

In addition to the added tests, this fixes Driver/modulewrap.swift. I did also find a bug while working on this where we aren't always planning an autolinking job when we should. I'm pretty sure that's an unrelated issue with how we're setting the object file format of triples though.

@owenv
Copy link
Contributor Author

owenv commented Aug 9, 2020

@swift-ci test Linux

@owenv
Copy link
Contributor Author

owenv commented Aug 9, 2020

@swift-ci please test Linux

@owenv
Copy link
Contributor Author

owenv commented Aug 9, 2020

@swift-ci please test Linux

@owenv
Copy link
Contributor Author

owenv commented Aug 9, 2020

@swift-ci please test Linux

@owenv
Copy link
Contributor Author

owenv commented Aug 9, 2020

@swift-ci please test Linux

if moduleOutputInfo.output != nil && !moduleInputs.isEmpty && compilerMode.usesPrimaryFileInputs {
jobs.append(try mergeModuleJob(inputs: moduleInputs))
mergeJob = try mergeModuleJob(inputs: moduleInputs)
Copy link
Contributor

Choose a reason for hiding this comment

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

You won’t have to force unwrap if you store this into a separate local variable.

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 wrote it this way to mirror the usage of var link: Job? below on line 219, it might be worth cleaning both instances up as a follow-up though

@owenv
Copy link
Contributor Author

owenv commented Aug 11, 2020

@swift-ci test

@DougGregor
Copy link
Member

@swift-ci please test macOS

@owenv owenv merged commit 2169113 into swiftlang:master Aug 11, 2020
@DougGregor
Copy link
Member

This is breaking Swift CI (https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-18_04/8618/consoleFull#-6367346333122a513-f36a-4c87-8ed7-cbc36a1ec144):

<EXPR>:0: error: BuildPlanTests.testExplicitSwiftPackageBuild : threw error "unableToFind(tool: "swift-autolink-extract")"
02:34:23 Test Case 'BuildPlanTests.testExplicitSwiftPackageBuild' failed (0.662 seconds)
02:34:23 Test Suite 'BuildPlanTests' failed at 2020-08-11 09:33:59.671
02:34:23 	 Executed 1 test, with 1 failure (1 unexpected) in 0.662 (0.662) seconds
02:34:23 Test Suite 'Selected tests' failed at 2020-08-11 09:33:59.672
02:34:23 	 Executed 1 test, with 1 failure (1 unexpected) in 0.662 (0.662) seconds

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