Skip to content

[wasm] Backport build improvements, and fixes from #61581 #62757

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

Merged
danmoseley merged 9 commits into from
Jan 8, 2022
Merged

[wasm] Backport build improvements, and fixes from #61581 #62757

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
aba594b
[wasm] Disable native strip for tests
radical Nov 15, 2021
cf5e41c
[wasm] improve fixup of symbol names
radical Nov 14, 2021
33218b3
[wasm] Extract BuildProject params to BuildProjectOptions record
radical Dec 2, 2021
eb64390
[wasm] Add WasmBuild.sln
radical Dec 2, 2021
01b965f
[wasm] Add `@(NativeFileReference)` to up-to-date check items for VS
radical Nov 10, 2021
00093b3
MonoAOTCompiler: log failed output as error
radical Nov 10, 2021
03740b5
[wasm] Improve error message when runtime pack cannot be found
radical Nov 11, 2021
0bff3bb
[wasm] PInvokeTableGenerator: don't fail on errors in reading custom …
radical Nov 14, 2021
8c6c304
replace '.', '-', and '+' with '_' instead of their code
radical Dec 3, 2021
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
Prev Previous commit
Next Next commit
[wasm] PInvokeTableGenerator: don't fail on errors in reading custom … 
…attributes

Inspired by https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1364890?src=WorkItemMention&src-action=artifact_link

Works around a NRE in CustomAttributeData.AttributeType because it's
ConstructorInfo is null.
The mono side issue: mono/mono#15340
  • Loading branch information
@radical
radical committed Dec 14, 2021
commit 0bff3bb81468af304cc975fb3bbea4f9da8b80b4
16 changes: 15 additions & 1 deletion src/tasks/WasmAppBuilder/PInvokeTableGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,21 @@ public void GenPInvokeTable(string[] pinvokeModules, string[] assemblies)

private void CollectPInvokes(List<PInvoke> pinvokes, List<PInvokeCallback> callbacks, Type type)
{
foreach (var method in type.GetMethods(BindingFlags.DeclaredOnly|BindingFlags.Public|BindingFlags.NonPublic|BindingFlags.Static|BindingFlags.Instance)) {
foreach (var method in type.GetMethods(BindingFlags.DeclaredOnly|BindingFlags.Public|BindingFlags.NonPublic|BindingFlags.Static|BindingFlags.Instance))
{
try
{
CollectPInvokesForMethod(method);
}
catch (Exception ex)
{
Log.LogMessage(MessageImportance.Low, $"Could not get pinvoke, or callbacks for method {method.Name}: {ex}");
continue;
}
}

void CollectPInvokesForMethod(MethodInfo method)
{
if ((method.Attributes & MethodAttributes.PinvokeImpl) != 0)
{
var dllimport = method.CustomAttributes.First(attr => attr.AttributeType.Name == "DllImportAttribute");
Expand Down