1442599 - Remove or replace macros/definitions in jsutil.h and jstypes.h with modern replacements

Status: RESOLVED FIXED

(Core :: JavaScript Engine, enhancement, P3)

Comment 1

[André Bargull [:anba]]

Attachment: bug1442599-part1-replace-autoassign.patch

AutoScopedAssign was only used in jsexn.cpp, replace it with MakeScopeExit and then remove AutoScopedAssign from jsutil.

Comment 2

[André Bargull [:anba]]

Attachment: bug1442599-part2-bitmap-macros.patch

The bitmap macros are only used in BytecodeEmitter.cpp, we can replace them with the bit-array-element functions (also defined in jsutil.h) and then remove the bitmap macros completely. The bit-array-element functions are internally asserting that no out-of-bounds access happens, so it's not less safe even though we're now passing the pointer returned by |Vector::begin()| to the bit-array-element functions.

Comment 3

[André Bargull [:anba]]

Attachment: bug1442599-part3-silence-unused.patch

The JS_SILENCE_UNUSED_VALUE_IN_EXPR macro is only used in builtin/Profilers.cpp, move it to that file so it's not accidentally used instead of mozilla::Unused.

Comment 4

[André Bargull [:anba]]

Attachment: bug1442599-part4-moz-always.patch

Replace the few remaining uses of JS_ALWAYS_{TRUE,FALSE} with MOZ_ALWAYS_{TRUE,FALSE}.

Comment 5

[André Bargull [:anba]]

Attachment: bug1442599-part5-remove-basic-stats.patch

Remove JSBasicStats from jsutil because it appears to be unused.

Comment 6

[André Bargull [:anba]]

Attachment: bug1442599-part6-jstypes-macros.patch

- JS_EXPORT_API was only used in js/src/shell/js.cpp and js/xpconnect/src/nsXPConnect.cpp, replace it with MOZ_EXPORT.
- And then we can remove all JS_{EXTERN,EXPORT,IMPORT} macros from jstypes.h, because they are no longer used.
- JS_BITS_PER_BYTE was only used twice, replace it CHAR_BIT, which is already used elsewhere.
- Remove the unused JS_BITS_PER_BYTE_LOG2 macro.
- And also remove the unused JS_EXTENSION macros.

Comment 7

[Jason Orendorff [:jorendorff]]

Comment on attachment 8955487 [details] [diff] [review]
bug1442599-part6-jstypes-macros.patch

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

Thanks!

Comment 8

[André Bargull [:anba]]

Attachment: bug1442599-part7-using-and-includes.patch

I've forgot to remove no longer used #includes and |using| declarations in part 5. 

While removing them I've noticed that |mozilla::Maybe| is used unqualified in jsutil.cpp. This currently works because jsutil.cpp includes vm/HelperThreads.h which in turn includes vm/JSContext.h which in turn includes vm/Runtime.h which in turn includes gc/ZoneGroup.h which in turn includes gc/Statistics.h and gc/Statistics.h has |using mozilla::Maybe|. And because vm/JSContext.h is part of this include chain, more or less any file in js/src can currently use |mozilla::Maybe| unqualified. Let's fix that and remove |using mozilla::Maybe| from gc/Statistics.h and then handle the fallout in various files.

Comment 9

[Jason Orendorff [:jorendorff]]

Comment on attachment 8955701 [details] [diff] [review]
bug1442599-part7-using-and-includes.patch

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

*sustained, thunderous applause*

Comment 10

[André Bargull [:anba]]

Attachment: bug1442599-part1-replace-autoassign.patch

Update part 1 to apply cleanly on inbound, carrying r+.

Comment 11

[André Bargull [:anba]]

Attachment: bug1442599-part4-moz-always.patch

Update part 4 to apply cleanly on inbound, carrying r+.

Comment 12

[André Bargull [:anba]]

Attachment: bug1442599-part7-using-and-includes.patch

Update part 7 to apply cleanly on inbound and to fix new files which don't properly include "mozilla/Maybe.h", carrying r+.

Comment 13

[André Bargull [:anba]]

Try: https://treeherder.mozilla.org/#/jobs?repo=try&revision=f37ce3df5fbced00cd323f7d28a7f51804d3d44b

Comment 14

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/61ecd1a2547c
Part 1: Replace AutoScopedAssign with MakeScopeExit. r=jorendorff
https://hg.mozilla.org/integration/mozilla-inbound/rev/593825fbb674
Part 2: Replace bitmap macros with BitArrayElement functions. r=jorendorff
https://hg.mozilla.org/integration/mozilla-inbound/rev/12150eddce35
Part 3: Move JS_SILENCE_UNUSED_VALUE_IN_EXPR macro to last remaining call site. r=jorendorff
https://hg.mozilla.org/integration/mozilla-inbound/rev/2269c7ed37ff
Part 4: Replace JS_ALWAYS_TRUE/FALSE with MOZ_ALWAYS_TRUE/FALSE. r=jorendorff
https://hg.mozilla.org/integration/mozilla-inbound/rev/43b8be56fa06
Part 5: Remove "Basic stats" from jsutil. r=jorendorff
https://hg.mozilla.org/integration/mozilla-inbound/rev/1ff23ca2f9fd
Part 6: Remove macros from jstypes.h when unused or replacements exist. r=jorendorff
https://hg.mozilla.org/integration/mozilla-inbound/rev/2c450d858f01
Part 7: Clean up using and includes in jsutil. r=jorendorff

Comment 15

[Cristian Brindusan [:cbrindusan]]

https://hg.mozilla.org/mozilla-central/rev/61ecd1a2547c
https://hg.mozilla.org/mozilla-central/rev/593825fbb674
https://hg.mozilla.org/mozilla-central/rev/12150eddce35
https://hg.mozilla.org/mozilla-central/rev/2269c7ed37ff
https://hg.mozilla.org/mozilla-central/rev/43b8be56fa06
https://hg.mozilla.org/mozilla-central/rev/1ff23ca2f9fd
https://hg.mozilla.org/mozilla-central/rev/2c450d858f01