1615710 - Use BaseScript in DebuggerScriptReferent

Status: RESOLVED FIXED

(Core :: JavaScript Engine, task, P1)

Description

[Ted Campbell [:tcampbell]]

Now that we are able to root js::BaseScript pointers directly it should be possible to cleanup the DebuggerScriptReferent and remove separate code paths used for LazyScripts. It should be possible to achieve this even before the LazyScript/JSScript instances are combined.

Comment 1

[Ted Campbell [:tcampbell]]

Attachment: Bug 1615710 - Simplify debugger usage of BaseScript::sourceObject. r?jandem

In Bug 1512509 we simplified BaseScript::sourceObject() to never use
cross-compartment edges. As a result we can simplify the debugger access of
sourceObject within this patch.

Comment 2

[Ted Campbell [:tcampbell]]

Attachment: Bug 1615710 - Simplify parts of debugger affecting LazyScript. r?jandem

• Simplify js::CheckDebugeeThing
• Simplify DelazifyScript
• Inline js::EnsureFunctionHasScript into callers and avoid using
  JSFunction::nonLazyScript() method.

Depends on D64119

Comment 3

[Ted Campbell [:tcampbell]]

Attachment: Bug 1615710 - Use BaseScriptVector in Debugger. r?jandem

Replace the uses of ScriptVector and LazyScriptVector.

Depends on D64120

Comment 4

[Ted Campbell [:tcampbell]]

Attachment: Bug 1615710 - Use BaseScript in Debugger ScriptWeakMap. r?jandem

This lets us eventually combine the lazy and non-lazy lists. To make this
work, we need to explicitly pass the expected type of variant element instead
of deducing it from the map.

Depends on D64121

Comment 5

[Ted Campbell [:tcampbell]]

Attachment: Bug 1615710 - Remove Debugger::wrapLazyScript. r?jandem

Replace with calls to wrapScript instead. Within wrapScript we now check if
script is lazy or not. This paves way to removing LazyScript* from the
DebuggerReferentVariant.

Depends on D64122

Comment 6

[Ted Campbell [:tcampbell]]

Attachment: Bug 1615710 - Remove the Debugger::lazyScripts weakmap. r?jandem

This can be combined with the Debugger::scripts map since keys will not
conflict. This is now all possible since we use js::BaseScript as the root
type.

Depends on D64123

Comment 7

[Ted Campbell [:tcampbell]]

Attachment: Bug 1615710 - Remove Debugger::ScriptQuery::lazyScriptVector. r?jandem

Once we use BaseScript as the root type, we can combine the ScriptQuery
result vectors which will be concatenated anyways.

Depends on D64124

Comment 8

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/a0f9c5c63d4f
Simplify debugger usage of BaseScript::sourceObject. r=jandem
https://hg.mozilla.org/integration/autoland/rev/07d450df0aab
Simplify parts of debugger affecting LazyScript. r=jandem
https://hg.mozilla.org/integration/autoland/rev/3ef1e468e53a
Use BaseScriptVector in Debugger. r=jandem
https://hg.mozilla.org/integration/autoland/rev/388b7ae2e7f6
Use BaseScript in Debugger ScriptWeakMap. r=jandem
https://hg.mozilla.org/integration/autoland/rev/2c5176ed5752
Remove Debugger::wrapLazyScript. r=jandem
https://hg.mozilla.org/integration/autoland/rev/30b40b53ff10
Remove the Debugger::lazyScripts weakmap. r=jandem
https://hg.mozilla.org/integration/autoland/rev/d36d060cd6a5
Remove Debugger::ScriptQuery::lazyScriptVector. r=jandem

Comment 9

[Ted Campbell [:tcampbell]]

Attachment: Bug 1615710 - Cleanup DebuggerScript::CallData::getUrl(). r?jandem

Eliminate the templates and use BaseScript type instead to simplify.

Comment 10

[Ted Campbell [:tcampbell]]

Attachment: Bug 1615710 - Add BaseScript cases to debugger variant matchers. r?jandem

Add a BaseScript case to variant matcher classes in the debugger and forward
the JSScript and LazyScript cases to it. This will call DelazifyScript for
all cases, so fix a small issue where this failed on non-function scripts.

Subsequent patches will remove the JSScript/LazyScript cases once the variant
type is updated.

Depends on D64365

Comment 11

[Ted Campbell [:tcampbell]]

Attachment: Bug 1615710 - Use js::BaseScript in DebuggerScriptVariant. r?jandem

Fold the JSScript* and LazyScript* variant arms into a single case. The
debugger now either uses BaseScript accessors directly, or uses
DelazifyScript to ensure bytecode exists if needed.

Note that there are still seperate instances for LazyScript and JSScript so
Debugger::wrapVariantReferent continues to be careful about normalizing
references.

Comment 13

[Andrei Ciure[:aciure]]

https://hg.mozilla.org/mozilla-central/rev/a0f9c5c63d4f
https://hg.mozilla.org/mozilla-central/rev/07d450df0aab
https://hg.mozilla.org/mozilla-central/rev/3ef1e468e53a
https://hg.mozilla.org/mozilla-central/rev/388b7ae2e7f6
https://hg.mozilla.org/mozilla-central/rev/2c5176ed5752
https://hg.mozilla.org/mozilla-central/rev/30b40b53ff10
https://hg.mozilla.org/mozilla-central/rev/d36d060cd6a5

Comment 14

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/d5935fae1300
Cleanup DebuggerScript::CallData::getUrl(). r=jandem
https://hg.mozilla.org/integration/autoland/rev/2d06ad181243
Add BaseScript cases to debugger variant matchers. r=jandem
https://hg.mozilla.org/integration/autoland/rev/7d3e520aa79a
Use js::BaseScript in DebuggerScriptVariant. r=jandem

Comment 15

[Andrei Ciure[:aciure]]

https://hg.mozilla.org/mozilla-central/rev/d5935fae1300
https://hg.mozilla.org/mozilla-central/rev/2d06ad181243
https://hg.mozilla.org/mozilla-central/rev/7d3e520aa79a