973296 - vm/ForkJoin.cpp:1318:9: error: use of undeclared identifier 'CALL_GENERATED_CODE' (--disable-yarr-jit)

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Jan Beich]

$ ./configure --enable-ion --disable-yarr-jit --with-system-icu
$ gmake
...
In file included from js/src/js/src/Unified_cpp_js_src8.cpp:158:
js/src/vm/ForkJoin.cpp:1318:9: error: use of undeclared identifier
      'CALL_GENERATED_CODE'
        CALL_GENERATED_CODE(enter_, jitcode_, argc_ + 1, argv_ + 1, nullptr...
        ^
js/src/vm/ForkJoin.cpp:1524:23: note: in instantiation of member
      function 'ParallelIonInvoke<2>::invoke' requested here
        bool ok = fii.invoke(perThread);
                      ^
1 error generated.

Comment 1

[Douglas Crosher [:dougc]]

fwiw CALL_GENERATED_CODE should be defined in js/src/jit/JitCommon.h and this should be included in ForkJoin.cpp via js/src/jit/BaselineJIT.h

Comment 2

[Jan Beich]

Attachment: include explicitly

Adding #error would show how the bootlegging via Yarr occurs

  vm/ForkJoin.cpp:13:
  vm/ForkJoin.h:14:
  gc/GCInternals.h:11:
  jsworkers.h:22:
  frontend/TokenStream.h:23:
  vm/RegExpObject.h:20:
  yarr/YarrJIT.h:50:
  jit/JitCommon.h

Comment 3

[Jan Beich]

Comment on attachment 8376787 [details] [diff] [review]
include explicitly

[Approval Request Comment]
Bug caused by (feature/regressing bug #): regression from bug 959597
User impact if declined: broken build with --disable-yarr-jit on ff29
Risk to taking this patch (and alternatives if risky): none

Comment 4

[Sylvestre Ledru [:Sylvestre]]

I will approve this uplift once it landed in m-c.

Comment 5

[Ryan VanderMeulen [:RyanVM]]

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

Comment 6

[Ryan VanderMeulen [:RyanVM]]

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

Comment 7

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/b2a10b07adba