Skip to content

Conversation

@nkcsgexi
Copy link
Contributor

@nkcsgexi nkcsgexi commented Jun 1, 2020

The PR focuses on propagating several flags related to explicit module building:

  • For Clang modules, we need build system to pass down extra clang flags -fno-implicit-modules, -fmodule-map-file= , -fmodule-file= to avoid building PCMs implicitly from the Swift compiler.

  • New flags -disable-implicit-swift-modules to prevent and stop the compilers from building any Swift modules from interfaces implicitly and diagnose if they have to.

rdar://62613306

@nkcsgexi
Copy link
Contributor Author

nkcsgexi commented Jun 1, 2020

@swift-ci please smoke test

Copy link
Contributor

Choose a reason for hiding this comment

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

There seem to be enough flags here to probably warrant a ModuleInterfaceOptions type. That can be done in a follow-up.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, I agree.

@nkcsgexi nkcsgexi force-pushed the add-flag-disable-swift-implicit branch from 6bce33d to 0f0782f Compare June 1, 2020 20:43
@nkcsgexi
Copy link
Contributor Author

nkcsgexi commented Jun 1, 2020

@swift-ci please smoke test

@nkcsgexi nkcsgexi force-pushed the add-flag-disable-swift-implicit branch from 0f0782f to 5142295 Compare June 1, 2020 21:11
@nkcsgexi
Copy link
Contributor Author

nkcsgexi commented Jun 1, 2020

@swift-ci please smoke test

@nkcsgexi nkcsgexi force-pushed the add-flag-disable-swift-implicit branch from 4c6fbd1 to 03f5654 Compare June 1, 2020 22:12
@nkcsgexi
Copy link
Contributor Author

nkcsgexi commented Jun 1, 2020

@swift-ci please smoke test

@nkcsgexi
Copy link
Contributor Author

nkcsgexi commented Jun 1, 2020

@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented Jun 1, 2020

Build failed
Swift Test Linux Platform
Git Sha - 6bce33d21a84320f2ad1ad55222bc574e9b2c72f

@swift-ci
Copy link
Contributor

swift-ci commented Jun 1, 2020

Build failed
Swift Test OS X Platform
Git Sha - 6bce33d21a84320f2ad1ad55222bc574e9b2c72f

@nkcsgexi
Copy link
Contributor Author

nkcsgexi commented Jun 2, 2020

@swift-ci Please smoke test Linux platform

Copy link
Member

@DougGregor DougGregor left a comment

Choose a reason for hiding this comment

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

Very cool! I had a couple of comments for improvements here, but nothing big.

Comment on lines 261 to 266
Copy link
Member

Choose a reason for hiding this comment

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

Can these go into SearchPathOptions along with the various search paths? They shouldn't affect the "language" per se.

Copy link
Contributor Author

@nkcsgexi nkcsgexi Jun 2, 2020

Choose a reason for hiding this comment

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

Yeah, I think SearchPathOptions probably is a more proper home for these paths.

Copy link
Member

Choose a reason for hiding this comment

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

Why pass -disable-implicit-swift-modules here? The scanner effectively doesn't heed that flag, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is to teach the scanner to channel this flag to all the reported build commands. So that all interface build commands in the JSON file now have -disable-implicit-swift-modules.

Copy link
Member

Choose a reason for hiding this comment

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

I think we've been trying to move toward "separate" flags nowadays, rather than joined flags with =.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ah, will fix

@nkcsgexi
Copy link
Contributor Author

nkcsgexi commented Jun 2, 2020

@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented Jun 2, 2020

Build failed
Swift Test Linux Platform
Git Sha - 48cfae6d8a1741e178961591ca841643e32710e5

@swift-ci
Copy link
Contributor

swift-ci commented Jun 2, 2020

Build failed
Swift Test OS X Platform
Git Sha - 48cfae6d8a1741e178961591ca841643e32710e5

@nkcsgexi nkcsgexi force-pushed the add-flag-disable-swift-implicit branch from 423cd36 to 5193c94 Compare June 2, 2020 21:54
@nkcsgexi
Copy link
Contributor Author

nkcsgexi commented Jun 2, 2020

@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented Jun 2, 2020

Build failed
Swift Test Linux Platform
Git Sha - 423cd3642e9691fa301661800b123b5ef1bc5eef

@swift-ci
Copy link
Contributor

swift-ci commented Jun 2, 2020

Build failed
Swift Test OS X Platform
Git Sha - 423cd3642e9691fa301661800b123b5ef1bc5eef

@nkcsgexi
Copy link
Contributor Author

nkcsgexi commented Jun 2, 2020

@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented Jun 2, 2020

Build failed
Swift Test OS X Platform
Git Sha - 5193c9473d59be1ec5a30a6ce9c9b5fea81cd8fa

@nkcsgexi
Copy link
Contributor Author

nkcsgexi commented Jun 2, 2020

@swift-ci please smoke test

@nkcsgexi nkcsgexi force-pushed the add-flag-disable-swift-implicit branch from 5193c94 to 0d74428 Compare June 2, 2020 23:51
@nkcsgexi
Copy link
Contributor Author

nkcsgexi commented Jun 2, 2020

@swift-ci please smoke test

2 similar comments
@nkcsgexi
Copy link
Contributor Author

nkcsgexi commented Jun 2, 2020

@swift-ci please smoke test

@nkcsgexi
Copy link
Contributor Author

nkcsgexi commented Jun 2, 2020

@swift-ci please smoke test

@nkcsgexi
Copy link
Contributor Author

nkcsgexi commented Jun 2, 2020

@swift-ci Please smoke test OS X platform

@nkcsgexi
Copy link
Contributor Author

nkcsgexi commented Jun 3, 2020

@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented Jun 3, 2020

Build failed
Swift Test Linux Platform
Git Sha - 5193c9473d59be1ec5a30a6ce9c9b5fea81cd8fa

@swift-ci
Copy link
Contributor

swift-ci commented Jun 3, 2020

Build failed
Swift Test OS X Platform
Git Sha - 5193c9473d59be1ec5a30a6ce9c9b5fea81cd8fa

@nkcsgexi nkcsgexi merged commit 83f807d into swiftlang:master Jun 3, 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.

4 participants