Add support for combining conflicting exported names. #3954
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
|
Depends on #3950 (dependency merged) |
jonmeow
force-pushed
the
export-conflict
branch
2 times, most recently
from
23ad66c
to
3f37a25
Compare
zygoloid
approved these changes
May 17, 2024
Comment on lines
+33
to
+35
| auto operator==(const ImportIRInst& rhs) const -> bool { | ||
| return ir_id == rhs.ir_id && inst_id == rhs.inst_id; | ||
| } |
There was a problem hiding this comment.
Suggested change
| auto operator==(const ImportIRInst& rhs) const -> bool { | |
| return ir_id == rhs.ir_id && inst_id == rhs.inst_id; | |
| } | |
| auto operator==(const ImportIRInst& rhs) const -> bool = default; |
There was a problem hiding this comment.
In file included from toolchain/sem_ir/name.cpp:8:
In file included from ./toolchain/sem_ir/file.h:20:
./toolchain/sem_ir/import_ir.h:33:8: error: explicitly defaulted equality comparison operator is implicitly deleted [-Werror,-Wdefaulted-function-deleted]
auto operator==(const ImportIRInst& rhs) const -> bool = default;
^
./toolchain/sem_ir/import_ir.h:28:30: note: defaulted 'operator==' is implicitly deleted because there is no viable three-way comparison function for base class 'Printable<Carbon::SemIR::ImportIRInst>'
struct ImportIRInst : public Printable<ImportIRInst> {
There was a problem hiding this comment.
Adding an explicit operator== to Printable fixes this, but makes all other children comparable too. I'm not sure that's what we want. Will follow up separately.
Co-authored-by: Richard Smith <richard@metafoo.co.uk>
Co-authored-by: Richard Smith <richard@metafoo.co.uk>
CJ-Johnson
pushed a commit
to CJ-Johnson/carbon-lang
that referenced
this pull request
May 23, 2024
…e#3954) I think this is a key remaining bit of polish for intra-package exports. Next I'm going to be dealing with cross-package exports, though I think the fundamentals here will remain intact. Extern declarations could cause issues for the current approach, but I think that can be addressed separately. I don't think it's a fundamental problem, more just incremental. --------- Co-authored-by: Richard Smith <richard@metafoo.co.uk>
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.
I think this is a key remaining bit of polish for intra-package exports. Next I'm going to be dealing with cross-package exports, though I think the fundamentals here will remain intact.
Extern declarations could cause issues for the current approach, but I think that can be addressed separately. I don't think it's a fundamental problem, more just incremental.