1460126 - Simplify TryEmitter member

Status: RESOLVED FIXED

(Core :: JavaScript Engine, enhancement, P3)

Description

[Tooru Fujisawa [:arai]]

similar to bug 1459845, TryEmitter can be simpified.
  * TryEmitter::ShouldUseRetVal and TryEmitter::ShouldUseControl can be merged
  * TryEmitter::State can become debug-only

Comment 1

[Tooru Fujisawa [:arai]]

Attachment: Part 1: Make TryEmitter::Kind and TryEmitter::State enum classes.

simply changed enum to enum class.

Comment 2

[Tooru Fujisawa [:arai]]

Attachment: Part 2: Merge TryEmitter::{ShouldUseRetVal,ShouldUseControl} into TryEmitter::ControlKind.

TryEmitter::ShouldUseRetVal and TryEmitter::ShouldUseControl are added to control the emitted bytecode, for syntactic try-catch and implicit internal try-catch.
and apparently they can be merged (there's no other usage)

Comment 3

[Tooru Fujisawa [:arai]]

Attachment: Part 3: Make TryEmitter::State debug only.

the branch based on TryEmitter::State can be converted into TryEmitter.kind_,
and now State is debug-only.
(State type is going to be debug-only also in all other helper classes)

Comment 4

[Tooru Fujisawa [:arai]]

Attachment: Part 4: Add MOZ_MUST_USE to TryEmitter methods.

Just added MOZ_MUST_USE

Comment 5

[Jeff Walden [:Waldo]]

Comment on attachment 8979162 [details] [diff] [review]
Part 3: Make TryEmitter::State debug only.

Review of attachment 8979162 [details] [diff] [review]:
-----------------------------------------------------------------

::: js/src/frontend/BytecodeEmitter.cpp
@@ +1689,5 @@
> +      , depth_(0)
> +      , noteIndex_(0)
> +      , tryStart_(0)
> +#ifdef DEBUG
> +      , state_(State::Start)

SpiderMonkey hasn't switched to this complete style for member-initializers, so keep everything up to noteIndex_ the same, remove the trailing comma from tryStart_, and then have the #ifdef DEBUG as you have it here.

Comment 6

[Tooru Fujisawa [:arai]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/0ad0b4d1b0f34ca4a8059b2f814be317ea5865d5
Bug 1460126 - Part 1: Make TryEmitter::Kind and TryEmitter::State enum classes. r=jwalden

https://hg.mozilla.org/integration/mozilla-inbound/rev/e2aabb9c50162fc250cabbbfe9c6c69ecdede6b9
Bug 1460126 - Part 2: Merge TryEmitter::{ShouldUseRetVal,ShouldUseControl} into TryEmitter::ControlKind. r=jwalden

https://hg.mozilla.org/integration/mozilla-inbound/rev/325ac4e5f005b00b3a9ec68b59cdb22180eb5725
Bug 1460126 - Part 3: Make TryEmitter::State debug only. r=jwalden

https://hg.mozilla.org/integration/mozilla-inbound/rev/05084c58cd39f65c141e39d2d28528be29056e96
Bug 1460126 - Part 4: Add MOZ_MUST_USE to TryEmitter methods. r=jwalden

Comment 7

[Noemi Erli[:noemi_erli]]

https://hg.mozilla.org/mozilla-central/rev/0ad0b4d1b0f3
https://hg.mozilla.org/mozilla-central/rev/e2aabb9c5016
https://hg.mozilla.org/mozilla-central/rev/325ac4e5f005
https://hg.mozilla.org/mozilla-central/rev/05084c58cd39