945564 - Move DataAlignment static const to function scope for unified build.

Status: RESOLVED FIXED

Description

[Shu-yu Guo [:shu]]

Building in unified mode might cause the DataAlignment static consts to
conflict when we add/remove new sources to JS.

Comment 1

[Shu-yu Guo [:shu]]

Created attachment 8341442 [details] [diff] [review]
Move DataAlignment static const to function scope for unified build.

Comment 2

[Jan de Mooij [:jandem] (PTO Sep 21-22)]

Comment on attachment 8341442 [details] [diff] [review]
Move DataAlignment static const to function scope for unified build.

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

::: js/src/jit/BaselineJIT.cpp
@@ +362,5 @@
>                      size_t pcMappingIndexEntries, size_t pcMappingSize,
>                      size_t bytecodeTypeMapEntries)
>  {
> +    // Be safe, align IC entry list to 8 in all cases.
> +    static const unsigned DataAlignment = sizeof(uintptr_t);

Pre-existing nit, but this comment is bogus for x86/ARM (4-byte pointers). We should probably just remove it.

Comment 3

[Shu-yu Guo [:shu]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/5c743a0cd2e2

Comment 4

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/5c743a0cd2e2