907117 - IonMonkey: build failed with DEBUG turned on

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Kan-Ru Chen [:kanru] (UTC+9)]

js/src/builtin/TestingFunctions.cpp: In function 'bool EnableOsiPointRegisterChecks(JSContext*, unsigned int, jsval*)':
js/src/builtin/TestingFunctions.cpp:899: error: 'js_IonOptions' is not a member of 'js::ion'

and

js/src/vm/Stack.h:1300: error: 'RegisterDump' does not name a type
js/src/vm/Stack.h: In static member function 'static size_t js::ion::JitActivation::offsetOfRegs()':
js/src/vm/Stack.h:1330: error: 'class js::ion::JitActivation' has no member named 'regs_'

Comment 1

[Kan-Ru Chen [:kanru] (UTC+9)]

Attachment: Patch

Comment 2

[Jan de Mooij [:jandem]]

I think it'd be better to change the definition of CHECK_OSIPOINT_REGISTERS (in IonTypes.h) so that it's only defined if JS_ION is defined.

Comment 3

[Kan-Ru Chen [:kanru] (UTC+9)]

Attachment: Path v2

That works too.

Comment 4

[Jan de Mooij [:jandem]]

You should be able to remove the vm/Stack.h change when you do that, or am I missing something?

Comment 5

[Kan-Ru Chen [:kanru] (UTC+9)]

Hmm.. right. So does it include Registers.h somewhere when JS_ION and DEBUG are both defined?

Comment 6

[Jan de Mooij [:jandem]]

Comment on attachment 792738 [details] [diff] [review]
Path v2

Review of attachment 792738 [details] [diff] [review]:
-----------------------------------------------------------------

The explicit Registers.h #include is okay I think. Thanks for fixing this!

Comment 7

[Kan-Ru Chen [:kanru] (UTC+9)]

Attachment: Patch for checkin

Comment 8

[Kan-Ru Chen [:kanru] (UTC+9)]

Inbound closed..

Comment 9

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/9ef7a6ded0b6

Comment 10

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/9ef7a6ded0b6