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.
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.
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.
Created attachment 565387 [details] [diff] [review] Remove hasfp() assertions on m-c.
http://hg.mozilla.org/projects/ionmonkey/rev/3ee51d2222b1 Pushed the above patch to IM branch.