656017 - Re-remove WinCE ifdef from js/src/vprof/vprof.cpp (was incorrectly added by bug 644900)

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Ed Morley [:emorley]]

It would appear bug 644900, when it landed, changed js/src/vprof/vprof.cpp even though this wasn't in the original patch. This re-added a WinCE (UNDER_CE) reference that was removed in bug 647389.

http://hg.mozilla.org/tracemonkey/rev/70dc21f4187f

http://hg.mozilla.org/mozilla-central/annotate/70dc21f4187f/js/src/vprof/vprof.cpp#l96

Comment 1

[Ed Morley [:emorley]]

Attachment: Re-remove WinCE ifdef

Comment 2

[Ed Morley [:emorley]]

jorendorff, ping for review please (1 line patch). 
Thanks :-)

Comment 3

[Jason Orendorff [:jorendorff]]

Comment on attachment 531332 [details] [diff] [review]
Re-remove WinCE ifdef

Sure.

Comment 4

[Ed Morley [:emorley]]

Thanks :-)

Comment 5

[Nicholas Nethercote [inactive]]

Oh, I can explain.  vprof/* are also imported from nanojit, so they must be merged in the same way that nanojit/* are merged.  That explains why vprof.cpp got changed.  (Sorry, that's very non-obvious.  I updated https://developer.mozilla.org/en/NanojitMerge to mention this.)

So I landed this on nanojit-central:

http://hg.mozilla.org/projects/nanojit-central/rev/b6b89f27651a

It'll get pulled into TM in the next NJ-to-TM merge.

Comment 6

[Ed Morley [:emorley]]

Ah wasn't aware vprof fell under nanojit - thanks :-)

Comment 7

[Ed Morley [:emorley]]

http://hg.mozilla.org/mozilla-central/rev/9c89c79056c7