IonMonkey: fix non-methodjit build

RESOLVED FIXED

Status

()

Core
JavaScript Engine
RESOLVED FIXED
5 years ago
5 years ago

People

(Reporter: evilpie, Assigned: evilpie)

Tracking

Trunk
x86_64
Linux
Points:
---

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment, 1 obsolete attachment)

(Assignee)

Description

5 years ago
Created attachment 633820 [details] [diff] [review]
fix
Attachment #633820 - Flags: review?(dvander)
(Assignee)

Comment 1

5 years ago
Created attachment 633822 [details] [diff] [review]
actual fix
Assignee: general → evilpies
Attachment #633820 - Attachment is obsolete: true
Status: NEW → ASSIGNED
Attachment #633820 - Flags: review?(dvander)
Attachment #633822 - Flags: review?(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.
Attachment #633822 - Flags: review?(dvander) → review+
(Assignee)

Comment 3

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

I still need to fix threadsafe builds to make tbpl happy.
(Assignee)

Comment 4

5 years ago
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).
Status: ASSIGNED → RESOLVED
Last Resolved: 5 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.