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
jorendorff, ping for review please (1 line patch). Thanks :-)
Comment on attachment 531332 [details] [diff] [review] Re-remove WinCE ifdef Sure.
Attachment #531332 - Flags: review?(jorendorff) → review+
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.
Ah wasn't aware vprof fell under nanojit - thanks :-)
Status: ASSIGNED → RESOLVED
Closed: 9 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla7
You need to log in before you can comment on or make changes to this bug.