833340 - Fix a couple of jittests failing with rooting analysis

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Jon Coppeard (:jonco)]

Currently I see the following jittests failing with rooting analysis turned on:

    /home/jon/work/dev/tree/js/src/jit-test/tests/auto-regress/bug599464.js
    /home/jon/work/dev/tree/js/src/jit-test/tests/auto-regress/bug600128.js
    /home/jon/work/dev/tree/js/src/jit-test/tests/auto-regress/bug607502.js
    /home/jon/work/dev/tree/js/src/jit-test/tests/auto-regress/bug607513.js
    /home/jon/work/dev/tree/js/src/jit-test/tests/auto-regress/bug638212.js
    /home/jon/work/dev/tree/js/src/jit-test/tests/basic/bug698584.js
    /home/jon/work/dev/tree/js/src/jit-test/tests/basic/testBug507425.js
    /home/jon/work/dev/tree/js/src/jit-test/tests/basic/testOverRecursed4.js
    /home/jon/work/dev/tree/js/src/jit-test/tests/ion/bug827821-2.js

Comment 1

[Jon Coppeard (:jonco)]

Attachment: Proposed fix

Comment 2

[Jon Coppeard (:jonco)]

Comment on attachment 704884 [details] [diff] [review]
Proposed fix

All jittests pass with the above patch.

The change to ConcatStringsMaybeAllowGC could perhaps be clearer, but I didn't immediately see a way to do this.

Comment 3

[Terrence Cole [:terrence]]

Comment on attachment 704884 [details] [diff] [review]
Proposed fix

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

Excellent!

::: js/src/jsscope.cpp
@@ +1054,5 @@
>       * initialized length and capacity of the object to zero and ensure that no
>       * new dense elements can be added without calling growElements(), which
>       * checks isExtensible().
>       */
> +    if (self->isNative() && !JSObject::sparsifyDenseElements(cx, self))

Ah, this is bug 830586. Please resolve it duplicate to this  bug.

::: js/src/vm/String.cpp
@@ +314,5 @@
>          return left;
>  
>      size_t wholeLength = leftLen + rightLen;
> +    JSContext *cxIfCanGC = allowGC ? cx : NULL;
> +    if (!JSString::validateLength(cxIfCanGC, wholeLength))

Thanks, that's way better. Please also change the name of validateLength's |cx| argument to |maybecx|.

Comment 5

[Jon Coppeard (:jonco)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/38cf4fcc0187

Comment 6

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/38cf4fcc0187