IonMonkey: 10/05 merge has gone awry.

RESOLVED FIXED

Status

()

Core
JavaScript Engine
RESOLVED FIXED
6 years ago
6 years ago

People

(Reporter: sstangl, Assigned: sstangl)

Tracking

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment)

(Assignee)

Description

6 years ago
Before merge,  2 jit-test failures on x64 --ion-eager.
After merge, 377 jit-test failures on x64 --ion-eager.

I will look into this.
(Assignee)

Comment 1

6 years ago
The crashes are in IonActivation::~IonActivation(), when resetting the stack regs.

In the IonActivation constructor, we repointRegs(NULL), and save the old registers.
In the IonActivation destructor, we repointRegs(oldRegs) -- but post-merge, ContextStack::repointRegs() now contains an assertion that regs hasfp(). But we set it to NULL. So we crash.

Since IonActivation knows the new fp, we could just set it in the new FrameRegs, hiding the others.
(Assignee)

Comment 2

6 years ago
Still ~110 crashes. Will handle in the morning.
Sorry, that was merge bustage on my part. We removed the assert in Ion and got it back accidentally.

Let's just get it removed on m-c.
(Assignee)

Comment 4

6 years ago
Created attachment 565387 [details] [diff] [review]
Remove hasfp() assertions on m-c.
Attachment #565387 - Flags: review?(luke)
(Assignee)

Comment 5

6 years ago
http://hg.mozilla.org/projects/ionmonkey/rev/3ee51d2222b1

Pushed the above patch to IM branch.

Updated

6 years ago
Attachment #565387 - Flags: review?(luke) → review+
Status: NEW → RESOLVED
Last Resolved: 6 years ago
Resolution: --- → WORKSFORME
Resolution: WORKSFORME → FIXED
You need to log in before you can comment on or make changes to this bug.