Use An AOT-friendly Linq implementation #894
Conversation
|
I'm still waiting for our Mono build to complete with these changes. |
|
The Mono build succeeded now. |
| @@ -2829,4 +2833,49 @@ public object[] Items | |||
| [System.Diagnostics.DebuggerBrowsable(System.Diagnostics.DebuggerBrowsableState.Never)] | |||
| private int count; | |||
| } | |||
|
|
|||
| #if UNITY | |||
There was a problem hiding this comment.
Is this needed for the unityjit profile? UNITY is defined for both unityjit and unityaot profiles. Where as UNITY_JIT and UNITY_AOT are the profile specific defines
There was a problem hiding this comment.
This is not needed for unityjit, but this .cs file is not included in the unityjit build. I was unaware that we had a specific define for unityaot. I'll change it to use that instead to be explicit.
There was a problem hiding this comment.
I've corrected this to use UNITY__AOT now.
| @@ -1 +1,3 @@ | |||
| #include winaot_System.Core.dll.sources | |||
| ../referencesource/System.Core/System/Linq/Enumerable.cs | |||
There was a problem hiding this comment.
We exclude all of Linq directory and only add Enumerable.cs?
There was a problem hiding this comment.
I think that everything we need is in Enumerable.cs. In the corefx code, everything is broken up into smaller files in a partial class. I did test this code with our .NET Standard 2.0 compliance tests, and it passes. So I think this is correct.
The corefx implementation of Linq is not AOT-friendly, and won't work with IL2CPP until IL2CPP gets full generic sharing support. So use the Linq implementation from reference source for the unityaot profile. This implementation is AOT-friendly. This change addresses case 1013854 in Unity.
joshpeterson
force-pushed
the
linq-unityaot-profile
branch
from
fd596b9 to
dab14a9
Compare
The corefx implementation of Linq is not AOT-friendly, and won't work
with IL2CPP until IL2CPP gets full generic sharing support. So use the
Linq implementation from reference source for the unityaot profile. This
implementation is AOT-friendly.
This change addresses case 1013854 in Unity.
I'll add release notes with the IL2CPP changes for this issue.