Skip to content
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.

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

WASM: Fix System.Diagnostics.Tracing #39271

Merged
merged 1 commit into from
Jul 14, 2020

Conversation

akoeplinger
Copy link
Member

It was missing a few signatures in wasm_m2n_invoke.g.h that caused it to fail with WASM-ERR: CANNOT HANDLE INTERP ICALL SIG IIILIIII

It was missing a few signatures in wasm_m2n_invoke.g.h that caused it to fail with `WASM-ERR: CANNOT HANDLE INTERP ICALL SIG IIILIIII`
@Dotnet-GitSync-Bot
Copy link
Collaborator

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

@vargaz
Copy link
Contributor

vargaz commented Jul 14, 2020

Its missing the changes to the generator .cs.

@akoeplinger
Copy link
Member Author

the generator still lives in mono/mono. will open a PR to update the generator there.

@akoeplinger
Copy link
Member Author

If you want to port it to dotnet/runtime here's the diff:

diff --git a/mcs/tools/wasm-tuner/InterpToNativeGenerator.cs b/mcs/tools/wasm-tuner/InterpToNativeGenerator.cs
index e110dd9b27c..84d1e325ffb 100644
--- a/mcs/tools/wasm-tuner/InterpToNativeGenerator.cs
+++ b/mcs/tools/wasm-tuner/InterpToNativeGenerator.cs
@@ -44,7 +44,10 @@ class InterpToNativeGenerator {
                "IIIIIIIIIIIII",
                "IIIIIIIIIIIIII",
                "IILIIII",
+               "IIILIIII",
                "IIIL",
+               "IIILLI",
+               "IL",
                "IF",
                "ID",
                "IIF",
@@ -133,6 +136,7 @@ class InterpToNativeGenerator {
                "VL",
                "VIL",
                "VIIL",
+               "VLII",
                "FIFFF",
                "FII",
                "FIII",

@@ -296,6 +296,16 @@ wasm_invoke_iiliiii (void *target_func, InterpMethodArguments *margs)

}

static void
wasm_invoke_iiiliiii (void *target_func, InterpMethodArguments *margs)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does "iiiliiii" mean?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, it's the signature, i.e. it returns an int, and accepts two ints, then a long, then four ints?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

correct

@akoeplinger akoeplinger merged commit aa667de into dotnet:master Jul 14, 2020
@akoeplinger akoeplinger deleted the fix-tracing branch July 14, 2020 16:07
@karelz karelz added this to the 5.0.0 milestone Aug 18, 2020
@ghost ghost locked as resolved and limited conversation to collaborators Dec 8, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants