887465 - double-conversion/utils.h and wtf/Assertions.h both define ASSERT in different ways

Status: RESOLVED FIXED

(Core :: MFBT, defect)

Description

[Emanuel Hoogeveen [:ehoogeveen]]

Attachment: Rewrite double-conversion's assertions in terms of the MOZ_* assertions, and keep wtf (Yarr) from redefining them

mfbt/double-conversion/utils.h and js/src/assembler/wtf/Assertions.h both define ASSERT (utils.h for double-conversion stuff and Assertions.h for Yarr), and their definitions don't match. So in addition to producing a compilation warning, it's hard to be sure which definition ends up getting used.

This patch replaces the ones in utils.h with MOZ_ equivalents (matching Assertions.h), and wraps the ASSERT define in Assertions.h in an #ifdef to prevent the compiler warning. This feels a bit hacky, but alternative patches would have been a fair bit more extensive.

Comment 1

[Jeff Walden [:Waldo]]

Try push:

https://tbpl.mozilla.org/?tree=Try&rev=e8f29c1f8c61

If that comes back green I'll push both patches.  Thanks!

Comment 2

[Jeff Walden [:Waldo]]

Looking green enough after a bit, pushed:

https://hg.mozilla.org/integration/mozilla-inbound/rev/87fedec338cf

Comment 3

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/87fedec338cf