Skip to content

Make R2R single method mode compatible with composite mode #118043

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make R2R single method mode compatible with composite mode #118043

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
20 changes: 17 additions & 3 deletions src/coreclr/tools/aot/crossgen2/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,10 +668,24 @@ private TypeDesc FindType(CompilerTypeSystemContext context, string typeName)
TypeDesc foundType = systemModule.GetTypeByCustomAttributeTypeName(typeName, false,
(module, typeDefName) => (MetadataType)module.Context.GetCanonType(typeDefName));

if (foundType == null)
throw new CommandLineException(string.Format(SR.TypeNotFound, typeName));
if (foundType != null)
return foundType;

return foundType;
// In composite mode the method we care about may be in any one of the input files, not just the system module.
if (Get(_command.Composite))
{
foreach (var searchModulePath in context.InputFilePaths.Values)
{
var searchModule = context.GetModuleFromPath(searchModulePath, true);
foundType = searchModule.GetTypeByCustomAttributeTypeName(typeName, false,
(module, typeDefName) => (MetadataType)module.Context.GetCanonType(typeDefName));

if (foundType != null)
return foundType;
}
}

throw new CommandLineException(string.Format(SR.TypeNotFound, typeName));
}

private MethodDesc CheckAndParseSingleMethodModeArguments(CompilerTypeSystemContext context)
Expand Down
Loading