1002041 - Bug 716647 breaks non-ion builds

Status: RESOLVED FIXED

(Core :: JavaScript Engine: JIT, defect)

Description

[Steve Singer (:stevensn)]

Bug 716647 
https://hg.mozilla.org/mozilla-central/rev/061ebab47be3

breaks non-ion builds

/media/nfs/usb_drive_src/firefox/mozilla-central-hg/src/js/src/vm/Stack.cpp: In constructor ‘js::FrameIter::FrameIter(const js::FrameIter::Data&)’:
/media/nfs/usb_drive_src/firefox/mozilla-central-hg/src/js/src/vm/Stack.cpp:700:15: error: ‘struct js::FrameIter::Data’ has no member named ‘jitFrames_’
/media/nfs/usb_drive_src/firefox/mozilla-central-hg/src/js/src/vm/Stack.cpp:701:16: error: ‘ionInlineFrames_’ was not declared in this scope
/media/nfs/usb_drive_src/firefox/mozilla-central-hg/src/js/src/vm/Stack.cpp:701:51: error: ‘const struct js::FrameIter::Data’ has no member named ‘ionInlineFrameNo_’
In file included from /home/ssinger/build-out.ppc64/js/src/Unified_cpp_js_src5.cpp:145:0:
/media/nfs/usb_drive_src/firefox/mozilla-central-hg/src/js/src/vm/Stack.cpp: In member function ‘js::FrameIter& js::FrameIter::operator++()’:
/media/nfs/usb_drive_src/firefox/mozilla-central-hg/src/js/src/vm/Stack.cpp:800:23: error: ‘popAsmJSFrame’ was not declared in this scope



/media/nfs/usb_drive_src/firefox/mozilla-central-hg/src/js/src/vm/Stack.cpp: In constructor ‘js::FrameIter::FrameIter(const js::FrameIter::Data&)’:
/media/nfs/usb_drive_src/firefox/mozilla-central-hg/src/js/src/vm/Stack.cpp:700:15: error: ‘struct js::FrameIter::Data’ has no member named ‘jitFrames_’
/media/nfs/usb_drive_src/firefox/mozilla-central-hg/src/js/src/vm/Stack.cpp:701:16: error: ‘ionInlineFrames_’ was not declared in this scope
/media/nfs/usb_drive_src/firefox/mozilla-central-hg/src/js/src/vm/Stack.cpp:701:51: error: ‘const struct js::FrameIter::Data’ has no member named ‘ionInlineFrameNo_’
In file included from /home/ssinger/build-out.ppc64/js/src/Unified_cpp_js_src5.cpp:145:0:
/media/nfs/usb_drive_src/firefox/mozilla-central-hg/src/js/src/vm/Stack.cpp: In member function ‘js::FrameIter& js::FrameIter::operator++()’:
/media/nfs/usb_drive_src/firefox/mozilla-central-hg/src/js/src/vm/Stack.cpp:800:23: error: ‘popAsmJSFrame’ was not declared in this scope

Comment 1

[Steve Singer (:stevensn)]

Attachment: 1002041_nonion.diff

Comment 2

[Shu-yu Guo [:shu]]

Comment on attachment 8413406 [details] [diff] [review]
1002041_nonion.diff

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

Stealing review, since this was my fault.

Looks good to me with minor style nits.

::: js/src/vm/Stack.cpp
@@ -695,5 @@
>    , ionInlineFrames_(data.cx_, data_.jitFrames_.isIonJS() ? &data_.jitFrames_ : nullptr)
>  #endif
>  {
>      JS_ASSERT(data.cx_);
> -

Style nit: please keep this newline.

@@ +802,5 @@
>          popAsmJSFrame();
>          break;
> +#else
> +        MOZ_ASSUME_UNREACHABLE("Unexpected state");
> +#endif

Style nit: could you refactor this method to have one MOZ_ASSUME_UNREACHABLE at the end, where cases that aren't handled |break| out of the switch?

Comment 3

[Steve Singer (:stevensn)]

Attachment: 1002041_nonion.diff

Patch updated to address the review nit's

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/08c2d710f13d

Comment 5

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/08c2d710f13d