Skip to content

Wrap exceptions from array constructors in TargetInvocationException #69440

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
May 17, 2022
Merged

Wrap exceptions from array constructors in TargetInvocationException #69440

Show file tree
Hide file tree
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 ....Private.Reflection.Core/src/System/Reflection/Runtime/MethodInfos/CustomMethodInvoker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ protected sealed override object Invoke(object thisObject, object[] arguments, B
{
result = _action(thisObject, convertedArguments, _thisType);
}
catch (Exception e) when (wrapInTargetInvocationException && ((_options & InvokerOptions.DontWrapException) == 0))
catch (Exception e) when (wrapInTargetInvocationException)
{
throw new TargetInvocationException(e);
}
Expand Down
1 change: 0 additions & 1 deletion ...ystem.Private.Reflection.Core/src/System/Reflection/Runtime/MethodInfos/InvokerOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ internal enum InvokerOptions
{
None = 0x00000000,
AllowNullThis = 0x00000001, // Don't raise an exception if the "thisObject" parameter to Invoker is null.
DontWrapException = 0x00000002, // Don't wrap target exceptions in TargetInvocationException.
}
}
6 changes: 3 additions & 3 deletions ...m.Private.Reflection.Core/src/System/Reflection/Runtime/TypeInfos/RuntimeArrayTypeInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ internal sealed override IEnumerable<RuntimeConstructorInfo> SyntheticConstructo
SyntheticMethodId.ArrayCtor,
arrayType,
ctorParameters,
InvokerOptions.AllowNullThis | InvokerOptions.DontWrapException,
InvokerOptions.AllowNullThis,
delegate (object _this, object[] args, Type thisType)
{
int[] lengths = new int[rank];
Expand Down Expand Up @@ -109,7 +109,7 @@ internal sealed override IEnumerable<RuntimeConstructorInfo> SyntheticConstructo
SyntheticMethodId.ArrayCtorJagged + parameterCount,
arrayType,
ctorParameters,
InvokerOptions.AllowNullThis | InvokerOptions.DontWrapException,
InvokerOptions.AllowNullThis,
delegate (object _this, object[] args, Type thisType)
{
int[] lengths = new int[args.Length];
Expand Down Expand Up @@ -145,7 +145,7 @@ internal sealed override IEnumerable<RuntimeConstructorInfo> SyntheticConstructo
SyntheticMethodId.ArrayMultiDimCtor,
arrayType,
ctorParameters,
InvokerOptions.AllowNullThis | InvokerOptions.DontWrapException,
InvokerOptions.AllowNullThis,
delegate (object _this, object[] args, Type thisType)
{
int[] lengths = new int[rank];
Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.Reflection/tests/ConstructorInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ public void Invoke_OneDimensionalArray()

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/67457", TestRuntimes.Mono)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/69336", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot))]
public void Invoke_OneDimensionalArray_NegativeLengths_ThrowsOverflowException()
{
ConstructorInfo[] constructors = GetConstructors(typeof(object[]));
Expand Down