Fix predicated analysis within points to analysis #6750
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
Fixes dotnet#6695 Fix predicated value flow in points to analysis to handle different types between the targetAnalysisEntity and different analysisEntity that shares the same location but has a different type. We use the conversion info between target type and analysis entity type to ensure the value can be flowed.
mavasani
commented
Jul 7, 2023
| @@ -237,38 +237,6 @@ private static void ResetAbstractValueIfTracked(AnalysisEntity analysisEntity, P | |||
| } | |||
| } | |||
|
|
|||
| private static void SetAbstractValueFromPredicate( | |||
There was a problem hiding this comment.
This method was converted to a local function as it had a single reference.
mavasani
commented
Jul 7, 2023
Comment on lines
+514
to
+536
| // Ensure that the predicated 'value' can be flowed from the target type to the analysis entity. | ||
| if (!SymbolEqualityComparer.Default.Equals(targetType, analysisEntity.Type)) | ||
| { | ||
| var conversion = compilation.ClassifyCommonConversion(targetType, analysisEntity.Type); | ||
| if (!conversion.Exists) | ||
| { | ||
| // No conversion exists, so we bail out from flowing the predicated value. | ||
| return; | ||
| } | ||
|
|
||
| if (!conversion.IsIdentity && !conversion.IsNumeric && !conversion.IsNullable) | ||
| { | ||
| // For 'Null' predicated value, there needs to be an explicit conversion | ||
| // from targetType to the analysisEntity's type to flow the predicated value. | ||
| // For 'NotNull' predicated value, there needs to be an implicit conversion | ||
| // from targetType to the analysisEntity's type to flow the predicated value. | ||
| if (nullState == NullAbstractValue.Null && conversion.IsImplicit || | ||
| nullState == NullAbstractValue.NotNull && !conversion.IsImplicit) | ||
| { | ||
| return; | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
This is the core bug fix. Rest of the code in this local function is same as before.
Youssef1313
reviewed
Jul 7, 2023
Comment on lines
+538
to
+541
| if (!sourceAnalysisData.TryGetValue(analysisEntity, out var existingValue)) | ||
| { | ||
| existingValue = defaultPointsToValueGenerator.GetOrCreateDefaultValue(analysisEntity); | ||
| } |
There was a problem hiding this comment.
I don't understand this area well, but wanted to make sure whether we want to add the analysisEntity and existingValue pair to sourceAnalysisData or not.
There was a problem hiding this comment.
This method is only designed to modify targetAnalysisData...
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #6750 +/- ##
=======================================
Coverage 96.33% 96.33%
=======================================
Files 1389 1389
Lines 325555 325649 +94
Branches 10731 10735 +4
=======================================
+ Hits 313614 313711 +97
+ Misses 9228 9226 -2
+ Partials 2713 2712 -1 |
Youssef1313
approved these changes
Jul 7, 2023
|
Thanks @Youssef1313! |
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.
Fixes #6695
Fix predicated value flow in points to analysis to handle different types between the targetAnalysisEntity and different analysisEntity that shares the same location but has a different type. We use the conversion info between target type and analysis entity type to ensure the value can be flowed.
This change may likely fix other CA1508 false positives which involve conversions. I am going to try to add tests for such cases and see if they are fixed, and if so, add unit tests for them in this PR.I'll instead create separate test PRs for any such fixed issues.