Fix #1462: Inconsistent enum flag check #1476
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
| @@ -763,6 +763,21 @@ TranslatedExpression TranslateCeq(Comp inst, out bool negateOutput) | |||
| .WithRR(rr); | |||
| } | |||
|
|
|||
| TranslatedExpression TryUniteEqualityOperandType(TranslatedExpression operand, TranslatedExpression otherOperand) | |||
There was a problem hiding this comment.
Using names like left and right instead of operand and otherOperand will improve readability of the code.
| // so that the const 0 value is printed as 0 integer and not as enum type, e.g. EnumType.None | ||
| if (operand.ResolveResult.IsCompileTimeConstant && | ||
| operand.ResolveResult.Type.IsCSharpPrimitiveIntegerType() && | ||
| (int)operand.ResolveResult.ConstantValue == 0 && |
There was a problem hiding this comment.
operand.ResolveResult.ConstantValue might be something else than a boxed int, so this can go wrong. This makes the unit tests fail. See https://ci.appveyor.com/project/icsharpcode/ilspy/build/job/wnhtrte5t1i7g5u9/tests
|
Thank you very much for providing the fix! I have added a few comments. @dgrunwald can you please review this? |
|
Thank you for providing this fix! |
ElektroKill
added a commit
to dnSpyEx/ILSpy
that referenced
this pull request
Jul 16, 2021
Fix icsharpcode#1462: Inconsistent enum flag check
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.
Changes
(enumValue & SomeEnum.SomeValue) == SomeEnum.Noneto
(enumValue & SomeEnum.SomeValue) == 0