852518 - Reorganize ifdefs and cleanup dtor in vm/ForkJoin.cpp

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Niko Matsakis [:nmatsakis]]

Peeling off two unrelated patches that are blocking bug 829602 into their own bug.

Comment 1

[Niko Matsakis [:nmatsakis]]

Attachment: NULL out the lock field and check it in the destructor.

Comment 2

[Niko Matsakis [:nmatsakis]]

Attachment: Adjust ifdef strategy

Make it clearer what happens JS_THREADSAFE is not enabled, and also do the same when JS_ION is not enabled, since ion is effectively required for any sort of parallel execution.

Comment 3

[Brian Hackett [Laid off!]]

Comment on attachment 726635 [details] [diff] [review]
Adjust ifdef strategy

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

::: js/src/vm/ForkJoin.cpp
@@ +19,5 @@
>  #endif
>  
> +#if defined(JS_THREADSAFE) && defined(JS_ION)
> +#  define JS_THREADSAFE_ION
> +#endif

There's no need for this indirection, just do:

#if defined(JS_THREADSAFE) && defineD(JS_ION)

real implementation

#else

dummy implementation

#endif

Comment 4

[Niko Matsakis [:nmatsakis]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/51313f09b4da
https://hg.mozilla.org/integration/mozilla-inbound/rev/ccb23fd0cfd7

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/51313f09b4da
https://hg.mozilla.org/mozilla-central/rev/ccb23fd0cfd7