Skip to content

Conversation

@jkotas
Copy link
Member

@jkotas jkotas commented May 6, 2022

No description provided.

@ghost ghost assigned jkotas May 6, 2022
@ghost ghost added the area-Meta label May 6, 2022
@ghost
Copy link

ghost commented May 6, 2022

Tagging subscribers to this area: @dotnet/area-meta
See info in area-owners.md if you want to be subscribed.

Issue Details

null

Author: jkotas
Assignees: jkotas
Labels:

area-Meta

Milestone: -

@jkotas jkotas requested a review from danmoseley May 6, 2022 05:41
@jkotas
Copy link
Member Author

jkotas commented May 6, 2022

This is the remaining cleanup for #68151 (comment) . Majority of remaining instances are links to archived issues that does not make sense to cleanup.

@jkotas jkotas force-pushed the corert branch 2 times, most recently from fa15f9b to bc9931e Compare May 6, 2022 13:46
@@ -84,8 +84,7 @@ internal sealed unsafe class OverlappedData
}
}

//CORERT: NativeOverlapped* pNativeOverlapped = (NativeOverlapped*)Interop.MemAlloc((UIntPtr)(sizeof(NativeOverlapped) + sizeof(GCHandle)));
NativeOverlapped* pNativeOverlapped = (NativeOverlapped*)Marshal.AllocHGlobal((IntPtr)(sizeof(NativeOverlapped) + sizeof(GCHandle)));
NativeOverlapped* pNativeOverlapped = (NativeOverlapped*)NativeMemory.Alloc((nuint)(sizeof(NativeOverlapped) + sizeof(GCHandle)));
Copy link
Member Author

Choose a reason for hiding this comment

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

I have converted several other places that used Marshal.AllocHGlobal to NativeMemory.Alloc while I was on it.

// Workaround for https://github.com/dotnet/runtime/issues/4731.
// When that's fixed, a [ThreadStatic] Stack should be added back to AllocFreeConcurrentStack<T>.
Copy link
Member Author

Choose a reason for hiding this comment

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

This bug has been fixed a long time ago. I have kept the workaround for netstandard builds.

@@ -30,10 +30,6 @@ public partial class Exception

private static string? SerializationWatsonBuckets => null;

// WARNING: We allow diagnostic tools to directly inspect these three members (_message, _innerException and _HResult)
Copy link
Member Author

Choose a reason for hiding this comment

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

Delete these comments from everywhere. They were specific to .NET Native for UWP debugger that we do not care about anymore.

@@ -145,8 +145,6 @@ class ICodeManager
PTR_PTR_VOID * ppvRetAddrLocation, // out
GCRefKind * pRetValueKind) = 0; // out

virtual void UnsynchronizedHijackMethodLoops(MethodInfo * pMethodInfo) = 0;
Copy link
Member Author

Choose a reason for hiding this comment

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

This was specific to .NET Native for UWP. We do not need it anymore.

@@ -13,20 +13,13 @@
a target called ComputeFilesToPublish which produces the ItemGroup
ResolvedFileToPublish based on the inputs of @(IntermediateAssembly)
and @(ResolvedAssembliesToPublish). We modify those two item groups
to control what gets published after CoreRT optimizes the application.

For .NET Core 3.0:
Copy link
Member Author

Choose a reason for hiding this comment

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

Deleting support for older .NET SDKs. We support .NET 6+ SDK only.

@jkotas jkotas merged commit 66b796a into dotnet:main May 7, 2022
@jkotas jkotas deleted the corert branch May 7, 2022 18:59
@ghost ghost locked as resolved and limited conversation to collaborators Jun 6, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants