Skip to content

ExplicitModuleLoader: take a JSON file that specifies details of explicit Swift modules #32355

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 2 commits into from
Jun 18, 2020

Conversation

nkcsgexi
Copy link
Contributor

Instead of taking paths of Swift module files from front-end command line
arguments, we should take a JSON file specifying details of explicit modules.
The advantages is (1) .swiftdoc and .swiftsourceinfo can be associated
with a .swiftmodule file, and (2) module names are explicitly used as
keys in the JSON input so we don't need to eagerly deserialize a .swiftmodule
file to collect the module name.

@nkcsgexi nkcsgexi force-pushed the json-for-explicit-swift-modules branch 2 times, most recently from 0d24dad to 38e7360 Compare June 17, 2020 19:44
nkcsgexi added 2 commits June 17, 2020 14:02
…icit Swift modules

Instead of taking paths of Swift module files from front-end command line
arguments, we should take a JSON file specifying details of explicit modules.
The advantages is (1) .swiftdoc and .swiftsourceinfo can be associated
with a .swiftmodule file, and (2) module names are explicitly used as
keys in the JSON input so we don't need to eagerly deserialize a .swiftmodule
file to collect the module name.
@nkcsgexi nkcsgexi force-pushed the json-for-explicit-swift-modules branch from 38e7360 to 1cb4eda Compare June 17, 2020 21:03
@nkcsgexi nkcsgexi changed the title [WIP] ExplicitModuleLoader: take a JSON file that specifies details of explicit Swift modules ExplicitModuleLoader: take a JSON file that specifies details of explicit Swift modules Jun 17, 2020
@nkcsgexi
Copy link
Contributor Author

@swift-ci please test

@nkcsgexi nkcsgexi requested review from DougGregor and artemcm June 17, 2020 22:30
@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 1cb4eda

@nkcsgexi
Copy link
Contributor Author

@swift-ci Please smoke test Linux platform

@nkcsgexi nkcsgexi merged commit c05d4bf into swiftlang:master Jun 18, 2020
@compnerd
Copy link
Member

@nkcsgexi - this seems to have caused a regression on the windows CI: https://ci-external.swift.org/job/oss-swift-windows-x86_64-vs2019/1770/consoleText

Could you please take a look?

@nkcsgexi
Copy link
Contributor Author

@compnerd ah, Will do. Thanks for pinging!

compnerd added a commit to compnerd/apple-swift that referenced this pull request Jun 18, 2020
stephentyrone pushed a commit that referenced this pull request Jun 19, 2020
artemcm added a commit to artemcm/swift-driver that referenced this pull request Jun 19, 2020
…xplicit Swift module dependencies

This PR implements the interface expected by the frontend, as built in:
swiftlang/swift#32355
swiftlang/swift#32450

Swift module's explicit Swift module dependencies are now encoded in a JSON file, passed with `-explicit-swift-module-map-file`
artemcm added a commit to artemcm/swift-driver that referenced this pull request Jun 19, 2020
…xplicit Swift module dependencies

This PR implements the interface expected by the frontend, as built in:
swiftlang/swift#32355
swiftlang/swift#32450

Swift module's explicit Swift module dependencies are now encoded in a JSON file, passed with `-explicit-swift-module-map-file`

Resolves rdar://problem/64533451
artemcm added a commit to artemcm/swift-driver that referenced this pull request Jun 19, 2020
…xplicit Swift module dependencies

This PR implements the interface expected by the frontend, as built in:
swiftlang/swift#32355
swiftlang/swift#32450

Swift module's explicit Swift module dependencies are now encoded in a JSON file, passed with `-explicit-swift-module-map-file`

Resolves rdar://problem/64533451
artemcm added a commit to artemcm/swift-driver that referenced this pull request Jun 19, 2020
…xplicit Swift module dependencies

This PR implements the interface expected by the frontend, as built in:
swiftlang/swift#32355
swiftlang/swift#32450

Swift module's explicit Swift module dependencies are now encoded in a JSON file, passed with `-explicit-swift-module-map-file`

Resolves rdar://problem/64533451
artemcm added a commit to artemcm/swift-driver that referenced this pull request Jun 19, 2020
…xplicit Swift module dependencies

This PR implements the interface expected by the frontend, as built in:
swiftlang/swift#32355
swiftlang/swift#32450

Swift module's explicit Swift module dependencies are now encoded in a JSON file, passed with `-explicit-swift-module-map-file`

Resolves rdar://problem/64533451
artemcm added a commit to artemcm/swift-driver that referenced this pull request Jun 19, 2020
…xplicit Swift module dependencies

This PR implements the interface expected by the frontend, as built in:
swiftlang/swift#32355
swiftlang/swift#32450

Swift module's explicit Swift module dependencies are now encoded in a JSON file, passed with `-explicit-swift-module-map-file`

Resolves rdar://problem/64533451
artemcm added a commit to artemcm/swift-driver that referenced this pull request Jun 22, 2020
…xplicit Swift module dependencies

This PR implements the interface expected by the frontend, as built in:
swiftlang/swift#32355
swiftlang/swift#32450

Swift module's explicit Swift module dependencies are now encoded in a JSON file, passed with `-explicit-swift-module-map-file`

Resolves rdar://problem/64533451
artemcm added a commit to artemcm/swift-driver that referenced this pull request Jun 22, 2020
…xplicit Swift module dependencies

This PR implements the interface expected by the frontend, as built in:
swiftlang/swift#32355
swiftlang/swift#32450

Swift module's explicit Swift module dependencies are now encoded in a JSON file, passed with `-explicit-swift-module-map-file`

Resolves rdar://problem/64533451
artemcm added a commit to artemcm/swift-driver that referenced this pull request Jun 22, 2020
…xplicit Swift module dependencies

This PR implements the interface expected by the frontend, as built in:
swiftlang/swift#32355
swiftlang/swift#32450

Swift module's explicit Swift module dependencies are now encoded in a JSON file, passed with `-explicit-swift-module-map-file`

Resolves rdar://problem/64533451
artemcm added a commit to artemcm/swift-driver that referenced this pull request Jun 23, 2020
…xplicit Swift module dependencies

This PR implements the interface expected by the frontend, as built in:
swiftlang/swift#32355
swiftlang/swift#32450

Swift module's explicit Swift module dependencies are now encoded in a JSON file, passed with `-explicit-swift-module-map-file`

Resolves rdar://problem/64533451
artemcm added a commit to artemcm/swift-driver that referenced this pull request Jun 23, 2020
…xplicit Swift module dependencies

This PR implements the interface expected by the frontend, as built in:
swiftlang/swift#32355
swiftlang/swift#32450

Swift module's explicit Swift module dependencies are now encoded in a JSON file, passed with `-explicit-swift-module-map-file`

Resolves rdar://problem/64533451
artemcm added a commit to artemcm/swift-driver that referenced this pull request Jun 23, 2020
…xplicit Swift module dependencies

This PR implements the interface expected by the frontend, as built in:
swiftlang/swift#32355
swiftlang/swift#32450

Swift module's explicit Swift module dependencies are now encoded in a JSON file, passed with `-explicit-swift-module-map-file`

Resolves rdar://problem/64533451
artemcm added a commit to artemcm/swift-driver that referenced this pull request Jun 24, 2020
…xplicit Swift module dependencies

This PR implements the interface expected by the frontend, as built in:
swiftlang/swift#32355
swiftlang/swift#32450

Swift module's explicit Swift module dependencies are now encoded in a JSON file, passed with `-explicit-swift-module-map-file`

Resolves rdar://problem/64533451
artemcm added a commit to artemcm/swift-driver that referenced this pull request Jun 29, 2020
…xplicit Swift module dependencies

This PR implements the interface expected by the frontend, as built in:
swiftlang/swift#32355
swiftlang/swift#32450

Swift module's explicit Swift module dependencies are now encoded in a JSON file, passed with `-explicit-swift-module-map-file`

Resolves rdar://problem/64533451
artemcm added a commit to artemcm/swift-driver that referenced this pull request Jul 1, 2020
…xplicit Swift module dependencies

This PR implements the interface expected by the frontend, as built in:
swiftlang/swift#32355
swiftlang/swift#32450

Swift module's explicit Swift module dependencies are now encoded in a JSON file, passed with `-explicit-swift-module-map-file`

Resolves rdar://problem/64533451
artemcm added a commit to artemcm/swift-driver that referenced this pull request Jul 1, 2020
…xplicit Swift module dependencies

This PR implements the interface expected by the frontend, as built in:
swiftlang/swift#32355
swiftlang/swift#32450

Swift module's explicit Swift module dependencies are now encoded in a JSON file, passed with `-explicit-swift-module-map-file`

Resolves rdar://problem/64533451
xymus pushed a commit to xymus/swift-driver that referenced this pull request Nov 6, 2020
…xplicit Swift module dependencies

This PR implements the interface expected by the frontend, as built in:
swiftlang/swift#32355
swiftlang/swift#32450

Swift module's explicit Swift module dependencies are now encoded in a JSON file, passed with `-explicit-swift-module-map-file`

Resolves rdar://problem/64533451
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