693886 - Non-threadsafe builds broken with JS_CallOnce link error

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Steve Fink [:sfink] [:s:]]

Attachment: Fix linkage of JS_CallOnce

jslock.cpp defines JS_CallOnce, but does not #include jsapi.h (directly or indirectly) if JS_THREADSAFE is not defined. This causes JS_CallOnce to be compiled with C++ name mangling.

Comment 1

[Jeff Walden [:Waldo]]

Comment on attachment 566408 [details] [diff] [review]
Fix linkage of JS_CallOnce

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

::: js/src/jslock.cpp
@@ +38,5 @@
>   * ***** END LICENSE BLOCK ***** */
>  
>  #include "jstypes.h"
>  #include "jspubtd.h"
> +#include "jsapi.h"

I don't think the order here matters, so let's alphabetize.  But past that, jsapi.h includes the other two.  Should we be over-including here, or no?  (Shades of the iwyy bug, about which I still have no idea what we want.)  At least alphabetize these, at most remove the other two includes if you think that's reasonable.

Comment 2

[Steve Fink [:sfink] [:s:]]

I'm going to alphabetize for now, but this is gross -- jslock.cpp previously only had internally-used functionality and so could carefully pick a subset of headers.

I've filed bug 693907 to move JS_CallOnce to jsapi.cpp so the headers are back the way they were, but I'm going to land this first.

Comment 3

[Marco Bonardo [:mak]]

https://hg.mozilla.org/mozilla-central/rev/69369e7dad6c