Skip to content

[browser][coreCLR] link out icu/globalization module on InvariantGlobalization flag #129336

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

Open
pavelsavara wants to merge 1 commit into
base: main
Choose a base branch
from
+52 −12
Open

[browser][coreCLR] link out icu/globalization module on InvariantGlobalization flag #129336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions src/mono/browser/build/BrowserWasmApp.CoreCLR.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,8 @@
<_WasmPInvokeModules Include="%(_WasmSourceFileToCompile.FileName)" Condition="'%(_WasmSourceFileToCompile.ScanForPInvokes)' != 'false'" />
<_WasmPInvokeModules Include="libSystem.Native" />
<_WasmPInvokeModules Include="libSystem.IO.Compression.Native" />
<_WasmPInvokeModules Include="libSystem.Globalization.Native" />
<_WasmPInvokeModules Include="libSystem.Globalization.Native" Condition="'$(InvariantGlobalization)' != 'true'" />
<_WasmIgnoredPInvokeModules Include="libSystem.Globalization.Native" Condition="'$(InvariantGlobalization)' == 'true'" />
<_WasmPInvokeModules Include="libSystem.Native.Browser" />
<_WasmPInvokeModules Include="libSystem.Runtime.InteropServices.JavaScript.Native" />
</ItemGroup>
Expand Down Expand Up @@ -433,6 +434,7 @@
<ManagedToNativeGenerator
Assemblies="@(_WasmManagedAssemblies)"
PInvokeModules="@(_WasmPInvokeModules)"
IgnoredPInvokeModules="@(_WasmIgnoredPInvokeModules)"
PInvokeOutputPath="$(_WasmPInvokeTablePath)"
ReversePInvokeOutputPath="$(_WasmReversePInvokeTablePath)"
InterpToNativeOutputPath="$(_WasmInterpToNativeTablePath)"
Expand Down Expand Up @@ -532,11 +534,10 @@
<_CoreCLRNativeLibs Include="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)libSystem.Native.Browser.a" />
<_CoreCLRNativeLibs Include="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)libSystem.Runtime.InteropServices.JavaScript.Native.a" />
<_CoreCLRNativeLibs Include="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)libSystem.Native.a" />
<!-- Use Condition="'$(InvariantGlobalization)' != 'true'" after fix for https://github.com/dotnet/runtime/issues/129242 -->
<_CoreCLRNativeLibs Include="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)libSystem.Globalization.Native.a" />
<_CoreCLRNativeLibs Include="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)libicuuc.a" />
<_CoreCLRNativeLibs Include="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)libicui18n.a" />
<_CoreCLRNativeLibs Include="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)libicudata.a" />
<_CoreCLRNativeLibs Include="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)libSystem.Globalization.Native.a" Condition="'$(InvariantGlobalization)' != 'true'" />
<_CoreCLRNativeLibs Include="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)libicuuc.a" Condition="'$(InvariantGlobalization)' != 'true'" />
<_CoreCLRNativeLibs Include="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)libicui18n.a" Condition="'$(InvariantGlobalization)' != 'true'" />
<_CoreCLRNativeLibs Include="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)libicudata.a" Condition="'$(InvariantGlobalization)' != 'true'" />
<_CoreCLRNativeLibs Include="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)libSystem.IO.Compression.Native.a" />
<_CoreCLRNativeLibs Include="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)libz.a" />

Expand Down
23 changes: 23 additions & 0 deletions src/mono/wasm/Wasm.Build.Tests/InvariantGlobalizationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,29 @@ public async Task AOT_InvariantGlobalization(Configuration config, bool aot, boo
public async Task RelinkingWithoutAOT(Configuration config, bool aot, bool? invariantGlobalization)
=> await TestInvariantGlobalization(config, aot, invariantGlobalization, isNativeBuild: true);

[ConditionalTheory(typeof(BuildTestBase), nameof(IsCoreClrRuntime))]
[BuildAndRun(aot: false, config: Configuration.Release)]
[TestCategory("no-workload")]
public void CoreCLRInvariantGlobalizationDoesNotLinkGlobalizationNative(Configuration config, bool aot)
{
string extraProperties = "<InvariantGlobalization>true</InvariantGlobalization>";
ProjectInfo info = CopyTestAsset(config, aot, TestAsset.WasmBasicTestApp, "invariant_coreclr", extraProperties: extraProperties);
ReplaceFile(Path.Combine("Common", "Program.cs"), Path.Combine(BuildEnvironment.TestAssetsPath, "EntryPoints", "InvariantGlobalization.cs"));
ReplaceMainJsWithMinimalRunMain();

PublishProject(info, config, new PublishOptions(GlobalizationMode: GlobalizationMode.Invariant, AOT: aot), isNativeBuild: true);

string nativeBuildDir = Path.Combine(_projectDir, "obj", config.ToString(), DefaultTargetFramework, "wasm", "for-publish");
string pinvokeTable = File.ReadAllText(Path.Combine(nativeBuildDir, "callhelpers-pinvoke.cpp"));
Assert.DoesNotContain("GlobalizationNative_", pinvokeTable);

string linkRsp = File.ReadAllText(Path.Combine(nativeBuildDir, "emcc-link.rsp"));
Assert.DoesNotContain("libSystem.Globalization.Native.a", linkRsp);
Assert.DoesNotContain("libicuuc.a", linkRsp);
Assert.DoesNotContain("libicui18n.a", linkRsp);
Assert.DoesNotContain("libicudata.a", linkRsp);
}

private async Task TestInvariantGlobalization(Configuration config, bool aot, bool? invariantGlobalization, bool? isNativeBuild = null)
{
string extraProperties = isNativeBuild == true ? "<WasmBuildNative>true</WasmBuildNative>" : "";
Expand Down
11 changes: 9 additions & 2 deletions src/tasks/WasmAppBuilder/coreclr/ManagedToNativeGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ public class ManagedToNativeGenerator : Task
[Required, NotNull]
public string[]? PInvokeModules { get; set; }

public string[] IgnoredPInvokeModules { get; set; } = Array.Empty<string>();

[Required, NotNull]
public string? PInvokeOutputPath { get; set; }

Expand Down Expand Up @@ -93,15 +95,20 @@ private void ExecuteInternal(LogAdapter log)
// SignatureMapper.CharToNativeType method.
string[] pregeneratedInterpreterToNativeSignatures = Array.Empty<string>(); // Currently none, but can be added here as needed in the future.

IEnumerable<string> cookies = pinvoke.Generate(PInvokeModules, PInvokeOutputPath, ReversePInvokeOutputPath);
IEnumerable<string> cookies = pinvoke.Generate(PInvokeModules, IgnoredPInvokeModules, PInvokeOutputPath, ReversePInvokeOutputPath);
cookies = cookies.Concat(internalCallCollector.GetSignatures());
cookies = cookies.Concat(pregeneratedInterpreterToNativeSignatures);

var m2n = new InterpToNativeGenerator(log);
m2n.Generate(cookies, InterpToNativeOutputPath);

if (!string.IsNullOrEmpty(CacheFilePath))
File.WriteAllLines(CacheFilePath, PInvokeModules, Encoding.UTF8);
{
IEnumerable<string> cacheLines = PInvokeModules
.Select(module => $"module:{module}")
.Concat(IgnoredPInvokeModules.Select(module => $"ignored:{module}"));
File.WriteAllLines(CacheFilePath, cacheLines, Encoding.UTF8);
}

List<string> fileWritesList = new() { PInvokeOutputPath, InterpToNativeOutputPath };
if (!string.IsNullOrEmpty(CacheFilePath))
Expand Down
17 changes: 13 additions & 4 deletions src/tasks/WasmAppBuilder/coreclr/PInvokeTableGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,23 @@ public void ScanAssembly(Assembly asm)
_pinvokeCollector.CollectPInvokes(pinvokes, callbacks, signatures, type);
}

public IEnumerable<string> Generate(string[] pinvokeModules, string outputPathPInvoke, string outputPathReversePInvoke)
public IEnumerable<string> Generate(string[] pinvokeModules, string[] ignoredPInvokeModules, string outputPathPInvoke, string outputPathReversePInvoke)
{
var ignoredModules = new HashSet<string>(ignoredPInvokeModules, StringComparer.Ordinal);
var modules = new SortedDictionary<string, string>(StringComparer.Ordinal);
foreach (var module in pinvokeModules)
modules[module] = module;
{
if (!ignoredModules.Contains(module))
modules[module] = module;
}

foreach (var module in ignoredModules.OrderBy(module => module, StringComparer.Ordinal))
Log.LogMessage(MessageImportance.Low, $"Ignoring PInvoke module {module}");

using TempFileName tmpFileNamePInvoke = new();
using (var w = new JoinedStringStreamWriter(tmpFileNamePInvoke.Path, false))
{
EmitPInvokeTable(w, modules, pinvokes);
EmitPInvokeTable(w, modules, ignoredModules, pinvokes);
}

using TempFileName tmpFileNameReversePInvoke = new();
Expand All @@ -71,12 +78,14 @@ public IEnumerable<string> Generate(string[] pinvokeModules, string outputPathPI
return signatures;
}

private void EmitPInvokeTable(StreamWriter w, SortedDictionary<string, string> modules, List<PInvoke> pinvokes)
private void EmitPInvokeTable(StreamWriter w, SortedDictionary<string, string> modules, HashSet<string> ignoredModules, List<PInvoke> pinvokes)
{
foreach (var pinvoke in pinvokes)
{
if (modules.ContainsKey(pinvoke.Module))
continue;
if (ignoredModules.Contains(pinvoke.Module))
continue;
// Handle special modules, and add them to the list of modules
// otherwise, skip them and throw an exception at runtime if they
// are called.
Expand Down
Loading