Skip to content

Fix CA2021 in MethodBodyScanner #81200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 26, 2023
Merged

Fix CA2021 in MethodBodyScanner #81200

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/MethodBodyScanner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ public virtual void InterproceduralScan(MethodIL startingMethodBody)
// are the same set of methods that we discovered and scanned above.
if (_annotations.CompilerGeneratedState.TryGetCompilerGeneratedCalleesForUserMethod(startingMethod, out List<TypeSystemEntity>? compilerGeneratedCallees))
{
var calleeMethods = compilerGeneratedCallees.OfType<MethodDefinition>();
var calleeMethods = compilerGeneratedCallees.OfType<MethodDesc>();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since OfType evaluation is lazy, this line is a nop (other than a null check on compilerGeneratedCallees). Presumably you could comment it out to go along with the subsequent commented out lines?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would work too. I went with this because this file is a line-by-line port from IL Linker where it looks like this:

runtime/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/ReferenceSource/MethodBodyScanner.cs

Lines 254 to 259 in d92e70f

var calleeMethods = compilerGeneratedCallees.OfType<MethodDefinition> ();
// https://github.com/dotnet/linker/issues/2845
// Disabled asserts due to a bug
// Debug.Assert (interproceduralState.Count == 1 + calleeMethods.Count ());
// foreach (var method in calleeMethods)
// Debug.Assert (interproceduralState.Any (kvp => kvp.Key.Method == method));

(It's identical modulo the odd illinker rule to put a space between method name and parameter list. You can see where the MethodDefinition came from. It happened to compile here, but it's still the wrong type.)

// https://github.com/dotnet/linker/issues/2845
// Disabled asserts due to a bug
// Debug.Assert (interproceduralState.Count == 1 + calleeMethods.Count ());
Expand Down