DiscIO: Fix broken workaround for MSVC ARM64 ICE #9949
Merged
+15
−11
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
JosJuice
changed the title
|
how about this? :D (no ICE here, but ofc would be great to check the logic) #define COMPARE_TIED_INNER(op, f, next) (f != other.f) ? (f op other.f) : next
#define COMPARE_TIED(op) \
COMPARE_TIED_INNER(op, partition_key, \
COMPARE_TIED_INNER(op, data_size, \
COMPARE_TIED_INNER(op, encrypted, \
COMPARE_TIED_INNER(op, value, true)))) |
The workaround added in 30f9f31 caused a regression where Dolphin incorrectly replaced runs of one byte with runs of another byte when writing WIA and RVZ files. ReuseID::operator< was always returning false unless the ReuseIDs being compared had different partition keys, which caused std::map<ReuseID, GroupEntry> to treat all ReuseIDs with the same partition key as equal.
JosJuice
changed the title
|
While it's not exactly pretty, it's the only solution so far that both works correctly (after fixing the bug in it) and doesn't trigger the ICE. Implemented. |
|
FifoCI detected that this change impacts graphical rendering. Here are the behavior differences detected by the system:
automated-fifoci-reporter |
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.
The workaround added in PR #9855 caused a regression where Dolphin incorrectly replaced runs of one byte with runs of another byte when writing WIA and RVZ files.
ReuseID::operator<was always returning false unless theReuseIDs being compared had different partition keys, which causedstd::map<ReuseID, GroupEntry>to treat allReuseIDs with the same partition key as equal.