Combine DiagnosticConverter into DiagnosticEmitter #4878
Merged
Conversation
This file contains 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
chandlerc
reviewed
Feb 5, 2025
toolchain/check/check.cpp
Outdated
| @@ -320,9 +320,12 @@ auto CheckParseTrees(llvm::MutableArrayRef<Unit> units, bool prelude_import, | |||
| // UnitAndImports is big due to its SmallVectors, so we default to 0 on the | |||
| // stack. | |||
| llvm::SmallVector<UnitAndImports, 0> unit_infos; | |||
| llvm::SmallVector<Parse::GetTreeAndSubtreesFn> all_trees_and_subtrees; | |||
There was a problem hiding this comment.
WDYT about naming this all_tree_getters or something to indicate these are callable things, not the trees themselves?
(And maybe can just mention tree here given its just a local variable?)
There was a problem hiding this comment.
Renamed to tree_and_subtrees_getters. I prefer to include the "and subtree" given we typically say "tree" for Parse::Tree. I'm assuming you suggested "all" because I had it before, but I was just trying to emphasize the plural there.
toolchain/lex/tokenized_buffer.h
Outdated
|
|
||
| private: | ||
| const TokenizedBuffer* tokens_; | ||
| Lex::TokenizedBuffer* tokens_; |
There was a problem hiding this comment.
const doesn't work here any more? Not a huge deal, just a bit surprising.
There was a problem hiding this comment.
Fixed (also the unnecessary namespace)
jonmeow
force-pushed
the
remove-diagnostic-converter
branch
from
2c33d7e to
d6351d5
Compare
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
At present, we typically define a DiagnosticConverter, then store an instance of it and a DiagnosticEmitter that wraps it. This is relatively minor in general, but I've been trying to create more self-contained DiagnosticEmitter classes (which hold their own DiagnosticConverter, similar to NullDiagnosticEmitter), and there it just gets in the way.
Since we don't reuse DiagnosticConverter instances, this combines the definition into DiagnosticEmitter. Mainly this means we don't have a separate object in play, and less to carry around.
The most impact is probably to SemIRDiagnosticConverter, which was also the most complex. Now
SemIRLocDiagnosticEmitter, this gets some different construction flow. Note in the PR I've split the file rename to its own commit, to try to help delta views. However, the most substantial parts of the refactoring are split into #4876, which this depends upon.