Skip to content
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

Jump to bottom

Pull GetUninitializedObject from RuntimeHelpers type on netcore #5360

Merged
merged 4 commits into from
Dec 3, 2020
Merged

Pull GetUninitializedObject from RuntimeHelpers type on netcore #5360

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a415a30
Pull GetUninitializedObject from RuntimeHelpers type on netcore
marek-safar Dec 2, 2020
d1a25a7
Try different define
marek-safar Dec 3, 2020
1cf9975
Another try
marek-safar Dec 3, 2020
8c1b15e
Bingo
marek-safar Dec 3, 2020
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
9 changes: 7 additions & 2 deletions src/Mono.Android/Android.Runtime/ConstructorBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@
using System.Threading;

namespace Android.Runtime {
internal class ConstructorBuilder {
static MethodInfo newobject = typeof (System.Runtime.Serialization.FormatterServices).GetMethod ("GetUninitializedObject", BindingFlags.Public | BindingFlags.Static)!;
internal static class ConstructorBuilder {
static readonly MethodInfo newobject =
#if NETFRAMEWORK || NET_2_0
typeof (System.Runtime.Serialization.FormatterServices).GetMethod ("GetUninitializedObject", BindingFlags.Public | BindingFlags.Static)!;
#else
typeof (System.Runtime.CompilerServices.RuntimeHelpers).GetMethod ("GetUninitializedObject", BindingFlags.Public | BindingFlags.Static)!;
#endif
static MethodInfo gettype = typeof (System.Type).GetMethod ("GetTypeFromHandle", BindingFlags.Public | BindingFlags.Static)!;
static FieldInfo handlefld = typeof (Java.Lang.Object).GetField ("handle", BindingFlags.NonPublic | BindingFlags.Instance)!;
static FieldInfo Throwable_handle = typeof (Java.Lang.Throwable).GetField ("handle", BindingFlags.NonPublic | BindingFlags.Instance)!;
Expand Down