Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 945564 - Move DataAlignment static const to function scope for unified build. (r=jandem)

Browse Source
This commit is contained in:
Shu-yu Guo 2013-12-05 15:51:56 -08:00
parent 0935a15335
commit 82205f202b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/src/jit/BaselineJIT.cpp
View File

@ -356,15 +356,14 @@ jit::CanEnterBaselineMethod(JSContext *cx, RunState &state)
return CanEnterBaselineJIT(cx, script, /* osr = */false);
};
// Be safe, align IC entry list to 8 in all cases.
static const unsigned DataAlignment = sizeof(uintptr_t);
BaselineScript *
BaselineScript::New(JSContext *cx, uint32_t prologueOffset,
uint32_t spsPushToggleOffset, size_t icEntries,
size_t pcMappingIndexEntries, size_t pcMappingSize,
size_t bytecodeTypeMapEntries)
{
static const unsigned DataAlignment = sizeof(uintptr_t);
size_t paddedBaselineScriptSize = AlignBytes(sizeof(BaselineScript), DataAlignment);
size_t icEntriesSize = icEntries * sizeof(ICEntry);

4
js/src/jit/Ion.cpp
View File

@ -751,8 +751,6 @@ IonScript::IonScript()
{
}
static const int DataAlignment = sizeof(void *);
IonScript *
IonScript::New(JSContext *cx, types::RecompileInfo recompileInfo,
uint32_t frameSlots, uint32_t frameSize, size_t snapshotsSize,
@ -760,6 +758,8 @@ IonScript::New(JSContext *cx, types::RecompileInfo recompileInfo,
size_t osiIndices, size_t cacheEntries, size_t runtimeSize,
size_t safepointsSize, size_t callTargetEntries, size_t backedgeEntries)
{
static const int DataAlignment = sizeof(void *);
if (snapshotsSize >= MAX_BUFFER_SIZE ||
(bailoutEntries >= MAX_BUFFER_SIZE / sizeof(uint32_t)))
{