765496 - IonMonkey: fix non-methodjit build

Status: RESOLVED FIXED

Description

[Limited Availabilty till Oct | Tom Schuster [:evilpie]]

Created attachment 633820 [details] [diff] [review]
fix

Comment 1

[Limited Availabilty till Oct | Tom Schuster [:evilpie]]

Created attachment 633822 [details] [diff] [review]
actual fix

Comment 2

[David Anderson [:dvander]]

Comment on attachment 633822 [details] [diff] [review]
actual fix

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

::: js/src/vm/Stack.h
@@ +57,5 @@
>  struct InlinedSite {};
>  #endif
>  typedef size_t FrameRejoinState;
>  
> +#ifdef JS_ION

No #ifdef's needed here.

@@ +487,3 @@
>      /* Called from IonMonkey to transition from bailouts. */
>      void initFromBailout(JSContext *cx, ion::SnapshotIterator &iter);
> +#endif

No #ifdefs needed here.

@@ +1668,5 @@
>  
>      /* Bailout for normal functions. */
>      StackFrame *pushBailoutFrame(JSContext *cx, const ion::IonBailoutIterator &it,
>                                   const CallArgs &args, BailoutFrameGuard *bfg);
> +#endif

No #ifdefs needed here.

Comment 3

[Limited Availabilty till Oct | Tom Schuster [:evilpie]]

I actually landed that?
http://hg.mozilla.org/projects/ionmonkey/rev/6722bb3c5549/

I still need to fix threadsafe builds to make tbpl happy.

Comment 4

[Limited Availabilty till Oct | Tom Schuster [:evilpie]]

https://hg.mozilla.org/projects/ionmonkey/rev/5d3e8c9dc6f8

Wasn't a NSPR issue after all, but in case this is giving you issues locally, you need a pretty recent version of NSPR (something with Bug 758837).