[Frontend] allow -emit-symbol-graph-dir and -supplementary-output-file-map at the same time #36500
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@swift-ci Please smoke test |
bitjammer
approved these changes
Mar 18, 2021
artemcm
approved these changes
Mar 18, 2021
|
@swift-ci Please build toolchain macOS platform |
|
macOS Toolchain Install command |
in some situations, enum element decls are being skipped when rendering declaration fragments. this trips an assertion in the declaration fragment renderer that ensures that it always renders something. by always rendering enum elements, we can sidestep this issue.
|
The toolchain hit an error when building symbol graphs in certain situations, so i've updated this PR with a fix to ensure that symbol graphs can still render when using supplementary file maps. @swift-ci Please smoke test |
@swift-ci Please smoke test macOS platform |
|
Same error. Looks like that node is having issues... @swift-ci Please smoke test macOS platform |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves rdar://75155133
When the
-emit-symbol-graph[-dir]flags were added, they were not completely integrated into the supplementary output file map structure. If a symbol graph is requested, these flags are passed to the frontend regardless of whether other supplementary outputs are collected into a file map. Because the frontend treats-emit-symbol-graph-dirand-supplementary-output-file-mapas incompatible, this creates a situation where an error is reported through no fault of the user. This PR removes the check to disallow-emit-symbol-graph-dir, since this information is not being emitted in the file map right now.A future PR will properly integrate
-emit-symbol-graph-dirinto the supplementary file map in the swift driver; this is meant as a stopgap for the meantime.