654929 - XPConnectJSMjit/JSTjit should be used only within #ifdef JS_METHODJIT/JS_TRACER

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Landry Breuil (:gaston)]

Landing of https://bugzilla.mozilla.org/show_bug.cgi?id=633653 broke OpenBSD/sparc64 (and maybe others) non-methodjit non-tracejit builds.

js/src/xpconnect/src/xpcjsruntime.cpp:1484: error: expected type-specifier before 'MemoryReporter_XPConnectJSMjitCode'
js/src/xpconnect/src/xpcjsruntime.cpp:1484: error: expected `)' before 'MemoryReporter_XPConnectJSMjitCode'

Etc etc, same errors for JSMjitdata, JSTjitCode, JSTjitDataAllocatorsMain, JSTjitDataAllocatorsReserve

Comment 1

[Landry Breuil (:gaston)]

Attachment: Add #ifdef JS_METHODJIT/JS_TRACER where appropriate

The attached patch should fix the issue, confirmation as soon as my build finishes.

Comment 2

[Landry Breuil (:gaston)]

For the record, see bottom of http://buildbot.rhaalovely.net/builders/mozilla-central-sparc64/builds/13/steps/build/logs/stdio for the complete buildlog failure.

Comment 3

[Nicholas Nethercote [inactive]]

Comment on attachment 530248 [details] [diff] [review]
Add #ifdef JS_METHODJIT/JS_TRACER where appropriate

Review of attachment 530248 [details] [diff] [review]:

Thanks for fixing my error! :)

Comment 4

[Landry Breuil (:gaston)]

My OpenBSD/sparc64 build is successful with the aforementioned patch, so setting checkin-needed.

Comment 5

[Boris Zbarsky [:bzbarsky]]

http://hg.mozilla.org/projects/cedar/rev/6beb0ffbdf98

Comment 6

[Boris Zbarsky [:bzbarsky]]

http://hg.mozilla.org/mozilla-central/rev/6beb0ffbdf98