Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@radical
Copy link
Member

@radical radical commented Apr 10, 2020

  • As object properties, we return a Target which has the signature of
    the delegate target.

Fixes #19382

- As object properties, we return a `Target` which has the signature of
the delegate target.

Fixes mono#19382
@radical radical force-pushed the wasm-viz-delegates branch from df027e1 to 6d24af1 Compare April 10, 2020 16:46
@radical radical changed the base branch from master to aj-wasm-viz-delegates April 10, 2020 16:53
@radical radical changed the base branch from aj-wasm-viz-delegates to aj-wasm-dbg-improve-vt-descr April 10, 2020 16:54
@radical
Copy link
Member Author

radical commented Apr 10, 2020

This is based on changes from #19490, so this doesn't target master right now. Once that PR is merged, then I can change it to merge to master.

* generating this for the delegate, and it's target.
*/
static GString*
mono_method_to_desc_for_js (MonoMethod *method, gboolean include_namespace)
Copy link
Member

Choose a reason for hiding this comment

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

This looks like it could be simplified and reduce allocations with a g_string_printf? Maybe just moved inline?

Copy link
Member Author

Choose a reason for hiding this comment

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

👍 Fixed.

@lewing lewing merged commit 4eca12e into mono:aj-wasm-dbg-improve-vt-descr Apr 14, 2020
@lewing
Copy link
Member

lewing commented Apr 14, 2020

@monojenkins backport 3.2-wasm

@monojenkins
Copy link
Contributor

@lewing backporting to 3.2-wasm failed, the patch results in conflicts:

Applying: [wasm][debugger] Show signature for delegate, or target, if available
Using index info to reconstruct a base tree...
M	sdks/wasm/DebuggerTestSuite/Tests.cs
Falling back to patching base and 3-way merge...
Auto-merging sdks/wasm/DebuggerTestSuite/Tests.cs
CONFLICT (content): Merge conflict in sdks/wasm/DebuggerTestSuite/Tests.cs
error: Failed to merge in the changes.
Patch failed at 0001 [wasm][debugger] Show signature for delegate, or target, if available

Please backport manually!

monojenkins pushed a commit to monojenkins/mono that referenced this pull request Apr 14, 2020
…mono#19505)

* [wasm][debugger] Show signature for delegate, or target, if available

- As object properties, we return a `Target` which has the signature of
the delegate target.

Fixes mono#19382

* [wasm][debugger] Some tidying up

* [wasm][debugger] Remove unused `sig_desc`

* [wasm][debugger] Simplify code, avoid extra allocations

.. as suggested by @lewing

(cherry picked from commit 4eca12e)
radical added a commit that referenced this pull request Apr 14, 2020
…#19505) (#19536)

* [wasm][debugger] Show signature for delegate, or target, if available

- As object properties, we return a `Target` which has the signature of
the delegate target.

Fixes #19382

* [wasm][debugger] Some tidying up

* [wasm][debugger] Remove unused `sig_desc`

* [wasm][debugger] Simplify code, avoid extra allocations

.. as suggested by @lewing

(cherry picked from commit 4eca12e)

Co-authored-by: Ankit Jain <[email protected]>
radical added a commit to radical/mono that referenced this pull request Apr 15, 2020
…mono#19505)

* [wasm][debugger] Show signature for delegate, or target, if available

- As object properties, we return a `Target` which has the signature of
the delegate target.

Fixes mono#19382

* [wasm][debugger] Some tidying up

* [wasm][debugger] Remove unused `sig_desc`

* [wasm][debugger] Simplify code, avoid extra allocations

.. as suggested by @lewing

(cherry picked from commit 4eca12e)
lewing pushed a commit that referenced this pull request Apr 17, 2020
#19535)

* [wasm][debugger] Show signature for delegate, or target, if available (#19505)

* [wasm][debugger] Show signature for delegate, or target, if available

- As object properties, we return a `Target` which has the signature of
the delegate target.

Fixes #19382

* [wasm][debugger] Some tidying up

* [wasm][debugger] Remove unused `sig_desc`

* [wasm][debugger] Simplify code, avoid extra allocations

.. as suggested by @lewing

(cherry picked from commit 4eca12e)

* [wasm][debugger] Fix tests broken because unused vars are not null

.. anymore, which is because we disabled optimizations in the
interpreter when debugging.

* [wasm][debugger][tests] Add tests to also check delegates in previous

.. frames.

* [wasm][debugger] Disable a test that tried to look at previous async

.. frames. This just happened to work. Currently, the trace has details
of the async machinery, instead of one reflecting what it might have
looked like for a non-async case. So, we can't reliably find the
previous method to inspect it's locals.

* [wasm][debugger] Fix test
lewing pushed a commit to lewing/mono that referenced this pull request Apr 17, 2020
mono#19535)

* [wasm][debugger] Show signature for delegate, or target, if available (mono#19505)

* [wasm][debugger] Show signature for delegate, or target, if available

- As object properties, we return a `Target` which has the signature of
the delegate target.

Fixes mono#19382

* [wasm][debugger] Some tidying up

* [wasm][debugger] Remove unused `sig_desc`

* [wasm][debugger] Simplify code, avoid extra allocations

.. as suggested by @lewing

(cherry picked from commit 4eca12e)

* [wasm][debugger] Fix tests broken because unused vars are not null

.. anymore, which is because we disabled optimizations in the
interpreter when debugging.

* [wasm][debugger][tests] Add tests to also check delegates in previous

.. frames.

* [wasm][debugger] Disable a test that tried to look at previous async

.. frames. This just happened to work. Currently, the trace has details
of the async machinery, instead of one reflecting what it might have
looked like for a non-async case. So, we can't reliably find the
previous method to inspect it's locals.

* [wasm][debugger] Fix test
lewing added a commit that referenced this pull request Apr 17, 2020
#19535) (#19579)

* [wasm][debugger] Show signature for delegate, or target, if available (#19505)

* [wasm][debugger] Show signature for delegate, or target, if available

- As object properties, we return a `Target` which has the signature of
the delegate target.

Fixes #19382

* [wasm][debugger] Some tidying up

* [wasm][debugger] Remove unused `sig_desc`

* [wasm][debugger] Simplify code, avoid extra allocations

.. as suggested by @lewing

(cherry picked from commit 4eca12e)

* [wasm][debugger] Fix tests broken because unused vars are not null

.. anymore, which is because we disabled optimizations in the
interpreter when debugging.

* [wasm][debugger][tests] Add tests to also check delegates in previous

.. frames.

* [wasm][debugger] Disable a test that tried to look at previous async

.. frames. This just happened to work. Currently, the trace has details
of the async machinery, instead of one reflecting what it might have
looked like for a non-async case. So, we can't reliably find the
previous method to inspect it's locals.

* [wasm][debugger] Fix test

Co-authored-by: Ankit Jain <[email protected]>
@radical radical deleted the wasm-viz-delegates branch May 8, 2020 20:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Debugging] Delegates show only type name in the Locals window

3 participants