Skip to content

[wasm] Build improvements, and fixes #61581

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
radical merged 13 commits into from
Dec 4, 2021
Merged

[wasm] Build improvements, and fixes #61581

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3d0ac89
[wasm] Disable native strip for tests
radical Nov 15, 2021
a568819
[wasm] improve fixup of symbol names
radical Nov 14, 2021
d49138f
[wasm] Extract BuildProject params to BuildProjectOptions record
radical Dec 2, 2021
e585ae2
[wasm] Add WasmBuild.sln
radical Dec 2, 2021
28eecd8
[wasm] Add `@(NativeFileReference)` to up-to-date check items for VS
radical Nov 10, 2021
aa84a54
MonoAOTCompiler: log failed output as error
radical Nov 10, 2021
cc2666e
[wasm] Improve error message when runtime pack cannot be found
radical Nov 11, 2021
cd18aff
[wasm] PInvokeTableGenerator: don't fail on errors in reading custom …
radical Nov 14, 2021
33ba6a7
replace '.', '-', and '+' with '_' instead of their code
radical Dec 3, 2021
85d0351
Merge remote-tracking branch 'origin/main' into wasm-build-fixes
radical Dec 3, 2021
18a06d3
[wasm] Disable failing AOT tests
radical Dec 3, 2021
557d304
Add more failing AOT tests
radical Dec 4, 2021
31c31ad
Merge remote-tracking branch 'origin/main' into wasm-build-fixes
radical Dec 4, 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 2, 2021
commit cd18affeb0ce5d4af3d83aadfcbb4f3d9b3d9d98
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