Load overlay ports in the correct order. #580
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
In OverlayProviderImpl::load_all_control_files, overlay directories are consulted in consecutive order. Each consulted directory overwrites any overlays that were visited previously. This means that given multiple overlays, the last one wins. However, in OverlayProviderImpl::load_port, the overlay directories are still consulted in consecutive order, but the first one is chosen. This means that the result will be different than load_all_control_files if multiple overlays contain the same port. Based on e2e tests, the intent appears to be that the first overlay wins, so we need to do load_all_control_files in reverse order.
BillyONeal
force-pushed
the
overlay-port-provider-order
branch
from
42ee83a
to
b1e700b
Compare
vicroms
approved these changes
Jun 13, 2022
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.
In OverlayProviderImpl::load_all_control_files, overlay directories are consulted in consecutive order. Each consulted directory overwrites any overlays that were visited previously. This means that given multiple overlays, the last one wins.
However, in OverlayProviderImpl::load_port, the overlay directories are still consulted in consecutive order, but the first one is chosen. This means that the result will be different than load_all_control_files if multiple overlays contain the same port.
Based on e2e tests, the intent appears to be that the first overlay wins, so we need to do load_all_control_files in reverse order.