663172 - Build issues in latest ionmonkey change

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Andrew Scheff]

Attachment: tiny change

After pulling the latest changes (Bug 661736), I got errors when trying to build the shell.  Specifically:

/Users/Andy/ionmonkey/js/src/ion/IonLIR.h:339: error: invalid use of non-static data member ‘js::ion::LDefinition::bits_’
/Users/Andy/ionmonkey/js/src/ion/IonLIR.h:353: error: from this location
/Users/Andy/ionmonkey/js/src/ion/IonLIR.h:355: error: ‘js::ion::LDefinition::VREG_MASK’ cannot be initialized by a non-constant expression when being declared
/Users/Andy/ionmonkey/js/src/ion/IonLIR.h: In member function ‘void js::ion::LDefinition::set(uint32, js::ion::LDefinition::Type, js::ion::LDefinition::Policy)’:
/Users/Andy/ionmonkey/js/src/ion/IonLIR.h:391: error: parameter may not have variably modified type ‘int [(((long unsigned int)((((unsigned int)((1 << ((int)js::ion::LDefinition::VREG_BITS)) - 1)) > 2097150u) ? 0 : -0x00000000000000002)) + 1u)]’

I've fixed the issue (I think), diff attached

Comment 1

[David Anderson [:dvander] - inactive, e-mail if emergency]

Comment on attachment 538298 [details] [diff] [review]
tiny change

Whoops, thanks!

Comment 2

[Andrew Scheff]

Pushed.

http://hg.mozilla.org/users/danderson_mozilla.com/ionmonkey/rev/145335d0e05a