Skip to content

Commit

Permalink
Bug 1290322 - Sync up BaselineScript::New parameter order. r=efaust
Browse files Browse the repository at this point in the history
  • Loading branch information
spinda committed Jul 29, 2016
1 parent 2ef2b4c commit 4624d3b
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 10 deletions.
15 changes: 10 additions & 5 deletions js/src/jit/BaselineJIT.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -399,12 +399,17 @@ jit::CanEnterBaselineMethod(JSContext* cx, RunState& state)
};

BaselineScript*
BaselineScript::New(JSScript* jsscript, uint32_t prologueOffset, uint32_t epilogueOffset,
uint32_t profilerEnterToggleOffset, uint32_t profilerExitToggleOffset,
uint32_t traceLoggerEnterToggleOffset, uint32_t traceLoggerExitToggleOffset,
BaselineScript::New(JSScript* jsscript,
uint32_t prologueOffset, uint32_t epilogueOffset,
uint32_t profilerEnterToggleOffset,
uint32_t profilerExitToggleOffset,
uint32_t traceLoggerEnterToggleOffset,
uint32_t traceLoggerExitToggleOffset,
uint32_t postDebugPrologueOffset,
size_t icEntries, size_t pcMappingIndexEntries, size_t pcMappingSize,
size_t bytecodeTypeMapEntries, size_t yieldEntries)
size_t icEntries,
size_t pcMappingIndexEntries, size_t pcMappingSize,
size_t bytecodeTypeMapEntries,
size_t yieldEntries)
{
static const unsigned DataAlignment = sizeof(uintptr_t);

Expand Down
12 changes: 7 additions & 5 deletions js/src/jit/BaselineJIT.h
Original file line number Diff line number Diff line change
Expand Up @@ -251,15 +251,17 @@ struct BaselineScript
MOZ_ASSERT(fallbackStubSpace_.isEmpty());
}

static BaselineScript* New(JSScript* jsscript, uint32_t prologueOffset,
uint32_t epilogueOffset, uint32_t postDebugPrologueOffset,
static BaselineScript* New(JSScript* jsscript,
uint32_t prologueOffset, uint32_t epilogueOffset,
uint32_t profilerEnterToggleOffset,
uint32_t profilerExitToggleOffset,
uint32_t traceLoggerEnterToggleOffset,
uint32_t traceLoggerExitToggleOffset,
size_t icEntries, size_t pcMappingIndexEntries,
size_t pcMappingSize,
size_t bytecodeTypeMapEntries, size_t yieldEntries);
uint32_t postDebugPrologueOffset,
size_t icEntries,
size_t pcMappingIndexEntries, size_t pcMappingSize,
size_t bytecodeTypeMapEntries,
size_t yieldEntries);

static void Trace(JSTracer* trc, BaselineScript* script);
static void Destroy(FreeOp* fop, BaselineScript* script);
Expand Down

0 comments on commit 4624d3b

Please sign in to comment.