Skip to content
This repository has been archived by the owner on Nov 1, 2020. It is now read-only.

[Interpreter] Array #6965

Merged
merged 13 commits into from
Feb 12, 2019
Merged

[Interpreter] Array #6965

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
45abf53
add support for newarr opcode (#5011)
tonerdo Jan 30, 2019
24b5131
add support for ldlen opcode (#5011)
tonerdo Jan 30, 2019
94a016b
add support for stelem.* opcodes (#5011)
tonerdo Feb 5, 2019
b85b5bb
add support for ldelem.* opcodes (#5011)
tonerdo Feb 5, 2019
26c1315
use the right arguement type metadata (#5011)
tonerdo Feb 7, 2019
cefb29f
handle when index values are native int (#5011)
tonerdo Feb 7, 2019
93cbf3c
use generic Unsafe class to read/write array elements (#5011)
tonerdo Feb 11, 2019
1a675e1
add array bounds check (#5011)
tonerdo Feb 11, 2019
b970c0c
remove nuint from public api surface (#5011)
tonerdo Feb 12, 2019
966ce8b
add assignability checks for stelem.ref opcode (#5011)
tonerdo Feb 12, 2019
74f24c9
add IntPtr to int conversion bounds check (#5011)
tonerdo Feb 12, 2019
9517413
address PR comments (#5011)
tonerdo Feb 12, 2019
591b308
simplify IntPtr<->int bounds check expression (#5011)
tonerdo Feb 12, 2019
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
17 changes: 17 additions & 0 deletions src/System.Private.CoreLib/src/Internal/Runtime/Augments/RuntimeAugments.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@

using Volatile = System.Threading.Volatile;

#if BIT64
jkotas marked this conversation as resolved.
Show resolved Hide resolved
using nuint = System.UInt64;
#else
using nuint = System.UInt32;
#endif

namespace Internal.Runtime.Augments
{
[ReflectionBlocked]
Expand Down Expand Up @@ -158,6 +164,17 @@ public static unsafe Array NewMultiDimArray(RuntimeTypeHandle typeHandleForArray
return Array.NewMultiDimArray(typeHandleForArrayType.ToEETypePtr(), pLengths, lengths.Length);
}

public static void StelemRef(Array array, int index, object obj)
{
TypeCast.StelemRef(array, index, obj);
Copy link
Member

@jkotas jkotas Feb 12, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

I suspect that this won't compile in the closed source ProjectN build (the Runtime,Base is not part of CoreLib in that build). @MichalStrehovsky Do you agree?

I think it would be easier to delete this method; and replace the calls with Unsafe.As<Object[]>(array)[index] = obj;.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, it wouldn't compile. Unsafe.As sounds good!

}

public static ref byte GetSzArrayElementAddress(Array array, int index)
{
ref byte start = ref array.GetRawSzArrayData();
return ref Unsafe.Add(ref start, (IntPtr)((nuint)index * array.ElementSize));
}

public static IntPtr GetAllocateObjectHelperForType(RuntimeTypeHandle type)
{
return RuntimeImports.RhGetRuntimeHelperForType(CreateEETypePtr(type), RuntimeImports.RuntimeHelperKind.AllocateObject);
Expand Down
Loading