Reunify code for Base.include and MainInclude.include #35348
Closed
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
These are only duplicated for better stack traces, and are otherwise meant to be the same. However the code here has already started to diverge in several minor but confusing ways. Factor the bodies into a macro to fix this.
|
I thought this should have the same backtraces as if it were actually just a function? But we appear to already have added |
|
Ah that's embarrassing. I forgot macros have a special handling for backtraces 🤦♂️ Hold on, I've got another idea. |
|
Replaced by #35371 |
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.
These are only duplicated for better stack traces, and are otherwise meant to be the same. However the code here has already started to diverge in several minor but confusing ways (#34595 etc) which is making a larger refactor related to #35243 more fiddly.
Factor the include bodies into a macro to improve this.
This also allows the bulk of the code to go in loading.jl which I find a little more natural.