[Diagnostics] Rely on clang headers for .dia block and record IDs #31849
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
owenv
commented
May 17, 2020
| @@ -334,7 +302,7 @@ void SerializedDiagnosticConsumer::emitMetaBlock() { | |||
| Stream.EnterSubblock(BLOCK_META, 3); | |||
| Record.clear(); | |||
| Record.push_back(RECORD_VERSION); | |||
| Record.push_back(Version); | |||
| Record.push_back(VersionNumber); | |||
There was a problem hiding this comment.
Note: This is 2 now, looking at git history, swift has incorrectly reported 1 since 2014. AFAICT, this is safe to change because no clients actually check it. If that's not the case, I can revert this change.
There was a problem hiding this comment.
Good catch. Let's qualify this clang::serialized_diags::VersionNumber
There was a problem hiding this comment.
sounds good to me, done
|
@swift-ci smoke test |
CodaFi
approved these changes
May 18, 2020
|
@swift-ci smoke test |
|
Windows run passed but wasn't reported: https://ci-external.swift.org/view/Pull%20Request/job/swift-PR-windows/3138/ |
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.
This makes it clearer Swift doesn't control the format, and prevents drift between the two sets of constants, which has been a source of bugs in the past.