986366 - js/src/vm/SPSProfiler.h:413:38: error: no member named 'js_JitOptions' in namespace 'js::jit' (--disable-ion)

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Jan Beich]

In file included from js/src/builtin/RegExp.cpp:7:
In file included from js/src/builtin/RegExp.h:10:
In file included from js/src/vm/RegExpObject.h:13:
In file included from js/src/jscntxt.h:15:
In file included from js/src/vm/Runtime.h:45:
js/src/vm/SPSProfiler.h:413:38: error: no member named 'js_JitOptions'
      in namespace 'js::jit'
        if (!inlinedFunction || jit::js_JitOptions.profileInlineFrames) {
                                ~~~~~^
js/src/vm/SPSProfiler.h:433:38: error: no member named 'js_JitOptions'
      in namespace 'js::jit'
        if (!inlinedFunction || jit::js_JitOptions.profileInlineFrames)
                                ~~~~~^
js/src/vm/SPSProfiler.h:453:27: error: no member named 'js_JitOptions'
      in namespace 'js::jit'
                if (!jit::js_JitOptions.profileInlineFrames && inliningDepth...
                     ~~~~~^
js/src/vm/SPSProfiler.h:460:42: error: no member named 'js_JitOptions'
      in namespace 'js::jit'
            if (!inlinedFunction || jit::js_JitOptions.profileInlineFrames)
                                    ~~~~~^
js/src/vm/SPSProfiler.h:474:43: error: no member named 'js_JitOptions'
      in namespace 'js::jit'
        else if (!inlinedFunction || jit::js_JitOptions.profileInlineFrames)
                                     ~~~~~^
js/src/vm/SPSProfiler.h:487:42: error: no member named 'js_JitOptions'
      in namespace 'js::jit'
            if (!inlinedFunction || jit::js_JitOptions.profileInlineFrames)
                                    ~~~~~^
6 errors generated.
gmake[1]: *** [RegExp.o] Error 1

http://mozillaproject.osuosl.org:8010/builders/runtests/builds/1156/steps/shell/logs/stdio
http://buildbot.rhaalovely.net/builders/mozilla-central-sparc64/builds/738/steps/build/logs/stdio

Comment 1

[Landry Breuil (:gaston)]

This broke non-sps builds (at least my sparc64 builders), can we get a fix ?

Comment 2

[Hannes Verschore [:h4writer]]

(In reply to Landry Breuil (:gaston) from comment #1)
> This broke non-sps builds (at least my sparc64 builders), can we get a fix ?

Sure. Can you give the configure flags you used (or .mozconfig file) to test if I solved the issue?

Comment 3

[Hannes Verschore [:h4writer]]

Attachment: Fix

Looks like compiling with --disable-ion was broken due to bug 948229. I didn't think about this when reviewing. Added the needed ifdefs

Comment 4

[Landry Breuil (:gaston)]

Testing it on http://buildbot.rhaalovely.net/builders/mozilla-central-sparc64/builds/750

.mozconfig has nothing special, but ion is disabled on sparc64:
mk_add_options MOZ_OBJDIR=/data/obj/buildslave/m-c
mk_add_options PYTHON=/usr/local/bin/python2.7
mk_add_options AUTOCLOBBER=1
export LDFLAGS=-Wl,--no-keep-memory
export CC=egcc
export CXX=eg++

Comment 5

[Landry Breuil (:gaston)]

Comment on attachment 8399164 [details] [diff] [review]
Fix

My build failed later on on skiagl failures (being worked on in bug #980891), but with that diff at least the js engine built.

Comment 6

[Kannan Vijayan [:djvj]]

Comment on attachment 8399164 [details] [diff] [review]
Fix

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

::: js/src/vm/SPSProfiler.h
@@ +471,5 @@
>                  }
>              }
>  
>              if (!inlinedFunction || jit::js_JitOptions.profileInlineFrames)
> +#endif

I dislike this #ifdef spanning both whole and partial code blocks.  Seems confusing.

Can you make it into two #ifdef blocks?  One covering the entire first conditional and body, and another covering the second conditional only?

Comment 7

[Hannes Verschore [:h4writer]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/629eb41ca3b8

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/629eb41ca3b8

Comment 9

[Firefox Commit Bot]

The following changeset is now in Firefox Nightly:

> 629eb41ca3b8 Bug 986366: Fix --disable-ion builds, r=djvj

Nightly Build Information:

        ID: 20140402030201
 Changeset: 4941a2ac0786109b08856738019b016a6c5a66a6
   Version: 31.0a1
      TBPL: https://tbpl.mozilla.org/?rev=4941a2ac0786
       URL: https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2014/04/2014-04-02-03-02-01-mozilla-central

Download Links:

>         Linux x86: https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2014/04/2014-04-02-03-02-01-mozilla-central/firefox-31.0a1.en-US.linux-i686.tar.bz2
>      Linux x86_64: https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2014/04/2014-04-02-03-02-01-mozilla-central/firefox-31.0a1.en-US.linux-x86_64.tar.bz2
> Linux x86_64 ASAN: https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2014/04/2014-04-02-03-02-01-mozilla-central/firefox-31.0a1.en-US.linux-x86_64-asan.tar.bz2
>               Mac: https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2014/04/2014-04-02-03-02-01-mozilla-central/firefox-31.0a1.en-US.mac.dmg
>             Win32: https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2014/04/2014-04-02-03-02-01-mozilla-central/firefox-31.0a1.en-US.win32.installer.exe
>             Win64: https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2014/04/2014-04-02-03-02-01-mozilla-central/firefox-31.0a1.en-US.win64-x86_64.installer.exe

Previous Nightly Build Information:

        ID: 20140401030203
 Changeset: 1417d180a1d8665b1a91b897d1cc4cc31e7980d4
   Version: 31.0a1
      TBPL: https://tbpl.mozilla.org/?rev=1417d180a1d8
       URL: https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2014/04/2014-04-01-03-02-03-mozilla-central