1066197 - Some iterator cleanup

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Jan de Mooij [:jandem]]

There's some cruft here, like js_IteratorMore taking a MutableHandleValue where it just wants a bool* and we can also remove jit::IteratorMore and js;:IteratorMore.

Comment 1

[Jan de Mooij [:jandem]]

Attachment: Part 1 - js_IteratorMore

Will post another patch to rename it to js::IteratorMore.

Comment 2

[Jan de Mooij [:jandem]]

Part 1:

https://hg.mozilla.org/integration/mozilla-inbound/rev/8a45ca4767de

Comment 3

[Jan de Mooij [:jandem]]

Attachment: Part 2 - Remove js::IteratorNext

js::IteratorNext has a path for native iterators and then calls js_IteratorNext. js_IteratorNext does exactly the same thing, so let's just use that one everywhere.

Comment 4

[Jan de Mooij [:jandem]]

Attachment: Part 3 - Remove js_* prefix

Move js_IteratorMore, js_IteratorNext, js_Suppress* and js_ThrowStopIteration into the js namespace and drop the js_*.

Comment 5

[Jan de Mooij [:jandem]]

Attachment: Part 4 - Move iterValue from JSContext to JSRuntime

I want to get rid of iterValue, but having it in the runtime simplifies some other patches before we are there.

Comment 6

[Brian Hackett [Laid off!]]

Comment on attachment 8488725 [details] [diff] [review]
Part 4 - Move iterValue from JSContext to JSRuntime

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

::: js/src/jsiter.cpp
@@ +1019,5 @@
>      /*
>       * Make sure the more/next state machine doesn't get stuck. A value might
>       * be left in iterValue when a trace is left due to an interrupt after
>       * JSOP_MOREITER but before the value is picked up by FOR*.
>       */

Wow, this comment is an antique.

Comment 7

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/8a45ca4767de

Comment 8

[Jan de Mooij [:jandem]]

Parts 2 and 3:

https://hg.mozilla.org/integration/mozilla-inbound/rev/5d9353b3572c
https://hg.mozilla.org/integration/mozilla-inbound/rev/7e47a9f5e048

Dropping part 4, bug 831585 removes cx->iterValue and moving it first is not necessary after all.

Comment 9

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/5d9353b3572c
https://hg.mozilla.org/mozilla-central/rev/7e47a9f5e048