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

Mirror changes from dotnet/coreclr#6920

Merged
stephentoub merged 3 commits into
dotnet:masterfrom
Dotnet-GitSync-Bot:mirror-merge-10036646
Jan 31, 2019
Merged

Mirror changes from dotnet/coreclr#6920
stephentoub merged 3 commits into
dotnet:masterfrom
Dotnet-GitSync-Bot:mirror-merge-10036646

Conversation

@Dotnet-GitSync-Bot
Copy link
Copy Markdown
Contributor

@Dotnet-GitSync-Bot Dotnet-GitSync-Bot commented Jan 30, 2019

This PR contains mirrored changes from dotnet/coreclr

Please REBASE this PR when merging

cc @stephentoub

@stephentoub stephentoub force-pushed the mirror-merge-10036646 branch 3 times, most recently from 693ab10 to 94b1ce6 Compare January 30, 2019 22:31
This requires merging/adapting the implementation with EnvironmentAugments (which goes away completely), the shared files, what corert has, etc.

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
@stephentoub stephentoub force-pushed the mirror-merge-10036646 branch from 94b1ce6 to 083a4ee Compare January 30, 2019 22:50
@stephentoub stephentoub force-pushed the mirror-merge-10036646 branch from 083a4ee to 731b47a Compare January 30, 2019 23:00
@stephentoub
Copy link
Copy Markdown
Member

@jkotas, are these WebAssembly legs known to fail, or did I likely cause the failures?

@jkotas
Copy link
Copy Markdown
Member

jkotas commented Jan 31, 2019

They fail because of we are calling GetUnixName very early during the startup here now:

15:25:50 abort@http://localhost:6931/HelloWasm.js:7085:44
15:25:50 _SystemNative_GetUnixName@http://localhost:6931/HelloWasm.js:2022:69
15:25:50 _S_P_CoreLib_Interop_Sys__GetUnixNamePrivate@http://localhost:6931/HelloWasm.js:1542080:1
15:25:50 _S_P_CoreLib_Interop_Sys__GetUnixName@http://localhost:6931/HelloWasm.js:1373820:1
15:25:50 _S_P_CoreLib_System_Environment___cctor@http://localhost:6931/HelloWasm.js:1373394:1
15:25:50 _S_P_CoreLib_System_Runtime_CompilerServices_ClassConstructorRunner__Call@http://localhost:6931/HelloWasm.js:1175463:1
15:25:50 _S_P_CoreLib_System_Runtime_CompilerServices_ClassConstructorRunner__EnsureClassConstructorRun@http://localhost:6931/HelloWasm.js:1146612:1
15:25:50 _S_P_CoreLib_System_Environment__SetCommandLineArgs@http://localhost:6931/HelloWasm.js:1164711:1

Calling GetUnixName on startup path is not nice. GetUnixName call is not required in CoreLib to figure out where we are on OSX. CoreLib is compiled OS-specific and we do have PLATFORM_OSX defined for Mac. We should use this define here.

(It is fine to append commits that modify shared partition to this PR. They will get mirrored once the PR is merged.)

@stephentoub
Copy link
Copy Markdown
Member

we do have PLATFORM_OSX defined for Mac. We should use this define here.

Ok. Thanks.

@stephentoub stephentoub merged commit 6bd279e into dotnet:master Jan 31, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants