Skip to content

[API Proposal]: Create array from array type #88620

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
jkotas merged 26 commits into from
Nov 16, 2023
Merged

[API Proposal]: Create array from array type #88620

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
626a750
Create array from array type
AlexRadch Jul 10, 2023
9305288
Code review
AlexRadch Jul 11, 2023
f0b2424
InternalCreateFromArrayType
AlexRadch Jul 11, 2023
58467db
GC
AlexRadch Jul 11, 2023
f90fda6
GC
AlexRadch Jul 11, 2023
824aabe
code review
AlexRadch Jul 12, 2023
8296fe6
code review Exceptions
AlexRadch Jul 12, 2023
d83dd4e
Merge remote-tracking branch 'upstream/main' into Array.CreateInstanc…
adamsitnik Oct 25, 2023
f32e6e5
code review:
adamsitnik Oct 25, 2023
8a9e015
address code review feedback: simplify the code
adamsitnik Oct 25, 2023
31e43a9
address code review feedback
adamsitnik Oct 27, 2023
387d0c5
supress new test on Mono, which seems to affect other tests as well, …
adamsitnik Oct 27, 2023
0ede3bd
Merge branch 'main' into Array.CreateInstanceFromArrayType
jkotas Nov 7, 2023
4816e63
Fix perf and corner-case behaviors
jkotas Nov 14, 2023
8a9d585
Merge branch 'main' into Array.CreateInstanceFromArrayType
jkotas Nov 15, 2023
5845090
Cleanup
jkotas Nov 15, 2023
87d756d
Delete superfluous validation
jkotas Nov 15, 2023
1f67190
Fix build break
jkotas Nov 15, 2023
39536c3
Smaller diff
jkotas Nov 15, 2023
2429e23
Fix build break
jkotas Nov 15, 2023
1a6de0f
build fix
adamsitnik Nov 15, 2023
8ce5332
FB, fix tests
jkotas Nov 15, 2023
19271ef
Add back workaround for Mono
jkotas Nov 16, 2023
85a44ff
Skip handling of void arrays for this PR
jkotas Nov 16, 2023
10660c1
Fix tests for native AOT
jkotas Nov 16, 2023
ad50dd5
Revert unnecessary change
jkotas Nov 16, 2023
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
Prev Previous commit
Next Next commit
code review Exceptions
  • Loading branch information
@AlexRadch
AlexRadch committed Jul 12, 2023
commit 8296fe679a2a42ed3db77f4e95c090ff8b0d0ea1
5 changes: 1 addition & 4 deletions src/libraries/System.Private.CoreLib/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4235,7 +4235,4 @@
<data name="OutOfMemory_StringTooLong" xml:space="preserve">
<value>String length exceeded supported range.</value>
</data>
<data name="Arg_MustBeArrayType" xml:space="preserve">
<value>Type must be a array type.</value>
</data>
</root>
</root>
12 changes: 6 additions & 6 deletions src/libraries/System.Private.CoreLib/src/System/Array.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,9 @@ public static unsafe Array CreateInstanceFromArrayType(Type arrayType, int lengt
ArgumentOutOfRangeException.ThrowIfNegative(length);

if (!arrayType.IsArray)
ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_MustBeArrayType, ExceptionArgument.arrayType);
ThrowHelper.ThrowArgumentException(ExceptionResource.Argument_HasToBeArrayClass, ExceptionArgument.arrayType);
if (arrayType.GetArrayRank() != 1)
ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_RankMultiDimNotSupported, ExceptionArgument.arrayType);

return InternalCreateFromArrayType(arrayType, 1, &length, null);
}
Expand All @@ -228,9 +228,9 @@ public static unsafe Array CreateInstanceFromArrayType(Type arrayType, params in
ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_NeedAtLeast1Rank);

if (!arrayType.IsArray)
ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_MustBeArrayType, ExceptionArgument.arrayType);
ThrowHelper.ThrowArgumentException(ExceptionResource.Argument_HasToBeArrayClass, ExceptionArgument.arrayType);
if (arrayType.GetArrayRank() != lengths.Length)
ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_RankIndices, ExceptionArgument.lengths);

// Check to make sure the lengths are all non-negative. Note that we check this here to give
// a good exception message if they are not; however we check this again inside the execution
Expand All @@ -255,9 +255,9 @@ public static unsafe Array CreateInstanceFromArrayType(Type arrayType, int[] len
ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_NeedAtLeast1Rank);

if (!arrayType.IsArray)
ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_MustBeArrayType, ExceptionArgument.arrayType);
ThrowHelper.ThrowArgumentException(ExceptionResource.Argument_HasToBeArrayClass, ExceptionArgument.arrayType);
if (arrayType.GetArrayRank() != lengths.Length)
ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_RankIndices, ExceptionArgument.lengths);

// Check to make sure the lengths are all non-negative. Note that we check this here to give
// a good exception message if they are not; however we check this again inside the execution
Expand Down
6 changes: 3 additions & 3 deletions src/libraries/System.Private.CoreLib/src/System/ThrowHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1149,8 +1149,8 @@ private static string GetResourceString(ExceptionResource resource)
return SR.Format_UnclosedFormatItem;
case ExceptionResource.Format_ExpectedAsciiDigit:
return SR.Format_ExpectedAsciiDigit;
case ExceptionResource.Arg_MustBeArrayType:
return SR.Arg_MustBeArrayType;
case ExceptionResource.Argument_HasToBeArrayClass:
return SR.Argument_HasToBeArrayClass;
default:
Debug.Fail("The enum value is not defined, please check the ExceptionResource Enum.");
return "";
Expand Down Expand Up @@ -1348,6 +1348,6 @@ internal enum ExceptionResource
Format_UnexpectedClosingBrace,
Format_UnclosedFormatItem,
Format_ExpectedAsciiDigit,
Arg_MustBeArrayType,
Argument_HasToBeArrayClass,
}
}