Skip to content

Warn on message formatting failure instead of crash, and fix Native AOT MakeGenericType failure #110330

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 9 commits into from
Jan 2, 2025
Merged

Warn on message formatting failure instead of crash, and fix Native AOT MakeGenericType failure #110330

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ae67ab6
Fix crash in message formatting with try/catch and fix NAOT failure.
jtschuster Dec 2, 2024
4aeb116
Merge branch 'main' of https://github.com/dotnet/runtime into TestNAO…
jtschuster Dec 3, 2024
c883da8
Remove extra using
jtschuster Dec 3, 2024
825344e
Extract instantiation to a local for readability
jtschuster Dec 4, 2024
18c20b8
Merge branch 'main' into TestNAOTFailure
jtschuster Dec 9, 2024
999fc82
Merge branch 'main' into TestNAOTFailure
jtschuster Dec 10, 2024
eae0efd
Remove test and formatting exception handling
jtschuster Dec 11, 2024
1aaac68
Merge branch 'TestNAOTFailure' of https://github.com/jtschuster/runti…
jtschuster Dec 11, 2024
826c7ee
Merge branch 'main' into TestNAOTFailure
jtschuster Dec 31, 2024
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
8 changes: 6 additions & 2 deletions src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/HandleCallAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,9 @@ private sealed class MakeGenericMethodSite : INodeWithRuntimeDeterminedDependenc
public IEnumerable<DependencyNodeCore<NodeFactory>.DependencyListEntry> InstantiateDependencies(NodeFactory factory, Instantiation typeInstantiation, Instantiation methodInstantiation)
{
var list = new DependencyList();
RootingHelpers.TryGetDependenciesForReflectedMethod(ref list, factory, _method.InstantiateSignature(typeInstantiation, methodInstantiation), "MakeGenericMethod");
MethodDesc instantiatedMethod = _method.InstantiateSignature(typeInstantiation, methodInstantiation);
if (instantiatedMethod.CheckConstraints(new InstantiationContext(typeInstantiation, methodInstantiation)))
RootingHelpers.TryGetDependenciesForReflectedMethod(ref list, factory, instantiatedMethod, "MakeGenericMethod");
return list;
}
}
Expand All @@ -725,7 +727,9 @@ private sealed class MakeGenericTypeSite : INodeWithRuntimeDeterminedDependencie
public IEnumerable<DependencyNodeCore<NodeFactory>.DependencyListEntry> InstantiateDependencies(NodeFactory factory, Instantiation typeInstantiation, Instantiation methodInstantiation)
{
var list = new DependencyList();
RootingHelpers.TryGetDependenciesForReflectedType(ref list, factory, _type.InstantiateSignature(typeInstantiation, methodInstantiation), "MakeGenericType");
TypeDesc instantiatedType = _type.InstantiateSignature(typeInstantiation, methodInstantiation);
if (instantiatedType.CheckConstraints(new InstantiationContext(typeInstantiation, methodInstantiation)))
RootingHelpers.TryGetDependenciesForReflectedType(ref list, factory, instantiatedType, "MakeGenericType");
return list;
}
}
Expand Down
Loading