Last Comment Bug 765496 - IonMonkey: fix non-methodjit build
: IonMonkey: fix non-methodjit build
Status: RESOLVED FIXED
:
Product: Core
Classification: Components
Component: JavaScript Engine (show other bugs)
: Trunk
: x86_64 Linux
: -- normal (vote)
: ---
Assigned To: Tom Schuster [:evilpie]
:
Mentors:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2012-06-16 09:31 PDT by Tom Schuster [:evilpie]
Modified: 2012-07-02 11:34 PDT (History)
1 user (show)
See Also:
Crash Signature:
(edit)
QA Whiteboard:
Iteration: ---
Points: ---
Has Regression Range: ---
Has STR: ---


Attachments
fix (8.06 KB, patch)
2012-06-16 09:31 PDT, Tom Schuster [:evilpie]
no flags Details | Diff | Splinter Review
actual fix (13.13 KB, patch)
2012-06-16 09:52 PDT, Tom Schuster [:evilpie]
dvander: review+
Details | Diff | Splinter Review

Description Tom Schuster [:evilpie] 2012-06-16 09:31:39 PDT
Created attachment 633820 [details] [diff] [review]
fix
Comment 1 Tom Schuster [:evilpie] 2012-06-16 09:52:25 PDT
Created attachment 633822 [details] [diff] [review]
actual fix
Comment 2 David Anderson [:dvander] 2012-06-18 15:26:43 PDT
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 Tom Schuster [:evilpie] 2012-07-02 08:09:54 PDT
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 Tom Schuster [:evilpie] 2012-07-02 11:34:28 PDT
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).

Note You need to log in before you can comment on or make changes to this bug.