892187 - Fix spurious uses of ExclusiveContext->asJSContext()

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Brian Hackett [Laid off!]]

Attachment: patch

Bug 885758 added a fair number of uses of cx->asJSContext() for ExclusiveContext or ThreadSafeContext.  Some of these calls are not justified and would lead to a null crash if they executed with an ExclusiveContext which is not a JSContext.  The attached patch goes through all these uses and either adds appropriate checks or restructures the code so that the asJSContext() is not necessary.

Comment 1

[Nicholas Nethercote [inactive]]

Attachment: Fix GGC builds.

bhackett, GGC builds are busted on inbound at the moment.  This patch fixes it,
though I'm not sure if it's the right fix w.r.t. the patch you have in this
bug.  Either way, if you could fix GGC builds as part of this bug that would be
helpful.  Thanks.

Comment 2

[Brian Hackett [Laid off!]]

Comment on attachment 774183 [details] [diff] [review]
Fix GGC builds.

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

This looks good, though it's independent from the existing patch in this bug and can land now.  Strange, I did a local ggc build before landing 885758 and it worked...

::: js/src/jsobj.cpp
@@ +2858,5 @@
>                     uint32_t oldCount, uint32_t newCount)
>  {
>  #ifdef JSGC_GENERATIONAL
>      if (cx->isJSContext()) {
> +        return cx->asJSContext()->runtime()-> gcNursery.reallocateElements(cx->asJSContext(), obj, oldHeader,

Can you rm the extra space on this line?

Comment 3

[Nicholas Nethercote [inactive]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/ec136828f42a


> Can you rm the extra space on this line?

Ugh, I forgot to do that.  Can you do it in your patch?  Thanks.

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/ec136828f42a

Comment 5

[Brian Hackett [Laid off!]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/949582d150c2

Comment 6

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/949582d150c2