Closed Bug 1002041 Opened 8 years ago Closed 8 years ago

Bug 716647 breaks non-ion builds

Categories

(Core :: JavaScript Engine: JIT, defect)

Other
Linux
defect
Not set
normal

Tracking

()

RESOLVED FIXED
mozilla31

People

(Reporter: stevensn, Assigned: stevensn)

References

Details

Attachments

(1 file, 1 obsolete file)

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
Blocks: 716647
Attached patch 1002041_nonion.diff (obsolete) — Splinter Review
Attachment #8413406 - Flags: review?(jdemooij)
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?
Attachment #8413406 - Flags: review?(jdemooij) → review+
Patch updated to address the review nit's
Attachment #8413406 - Attachment is obsolete: true
Assignee: nobody → steve
Keywords: checkin-needed
https://hg.mozilla.org/mozilla-central/rev/08c2d710f13d
Status: NEW → RESOLVED
Closed: 8 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla32
Target Milestone: mozilla32 → mozilla31
You need to log in before you can comment on or make changes to this bug.