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

Back out 79684dc64173 (bug 898936) for 10.7 debug M4 crashes

Browse Source
This commit is contained in:
Phil Ringnalda 2013-08-11 17:34:20 -07:00
parent b151a2e534
commit ceaeadcb34
8 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jit/BacktrackingAllocator.cpp
View File

@ -1189,7 +1189,7 @@ BacktrackingAllocator::dumpLiveness()
LBlock *block = graph.getBlock(blockIndex);
MBasicBlock *mir = block->mir();
printf("\nBlock %lu", static_cast<unsigned long>(blockIndex));
printf("\nBlock %lu", blockIndex);
for (size_t i = 0; i < mir->numSuccessors(); i++)
printf(" [successor %u]", mir->getSuccessor(i)->id());
printf("\n");
@ -1234,7 +1234,7 @@ BacktrackingAllocator::dumpLiveness()
printf("reg %s: %s\n", AnyRegister::FromCode(i).name(), IntervalString(fixedIntervals[i]));
for (size_t i = 0; i < graph.numVirtualRegisters(); i++) {
printf("v%lu:", static_cast<unsigned long>(i));
printf("v%lu:", i);
VirtualRegister &vreg = vregs[i];
for (size_t j = 0; j < vreg.numIntervals(); j++) {
if (j)
@ -1269,7 +1269,7 @@ BacktrackingAllocator::dumpAllocations()
printf("Allocations:\n");
for (size_t i = 0; i < graph.numVirtualRegisters(); i++) {
printf("v%lu:", static_cast<unsigned long>(i));
printf("v%lu:", i);
VirtualRegister &vreg = vregs[i];
for (size_t j = 0; j < vreg.numIntervals(); j++) {
if (j)

10
js/src/jit/PerfSpewer.cpp
View File

@ -149,7 +149,7 @@ PerfSpewer::writeProfile(JSScript *script,
if (size > 0) {
fprintf(fp_,
"%lx %lx %s:%d: Func%02d\n",
reinterpret_cast<unsigned long>(code->raw()),
reinterpret_cast<uintptr_t>(code->raw()),
size,
script->filename(),
script->lineno,
@ -170,8 +170,7 @@ PerfSpewer::writeProfile(JSScript *script,
if (cur < blockStart) {
fprintf(fp_,
"%lx %lx %s:%d: Func%02d-Block?\n",
static_cast<unsigned long>(cur),
static_cast<unsigned long>(blockStart - cur),
cur, blockStart - cur,
script->filename(), script->lineno,
thisFunctionIndex);
}
@ -182,7 +181,7 @@ PerfSpewer::writeProfile(JSScript *script,
if (size > 0) {
fprintf(fp_,
"%lx %lx %s:%d:%d: Func%02d-Block%d\n",
static_cast<unsigned long>(blockStart), size,
blockStart, size,
r.filename, r.lineNumber, r.columnNumber,
thisFunctionIndex, r.id);
}
@ -194,8 +193,7 @@ PerfSpewer::writeProfile(JSScript *script,
if (cur < funcEnd) {
fprintf(fp_,
"%lx %lx %s:%d: Func%02d-OOL\n",
static_cast<unsigned long>(cur),
static_cast<unsigned long>(funcEnd - cur),
cur, funcEnd - cur,
script->filename(), script->lineno,
thisFunctionIndex);
}

2
js/src/jit/RegisterAllocator.cpp
View File

@ -366,7 +366,7 @@ AllocationIntegrityState::dump()
LBlock *block = graph.getBlock(blockIndex);
MBasicBlock *mir = block->mir();
printf("\nBlock %lu", static_cast<unsigned long>(blockIndex));
printf("\nBlock %lu", blockIndex);
for (size_t i = 0; i < mir->numSuccessors(); i++)
printf(" [successor %u]", mir->getSuccessor(i)->id());
printf("\n");

2
js/src/jit/arm/Assembler-arm.h
View File

@ -572,7 +572,7 @@ struct RIS
{
JS_ASSERT(ShiftAmount == imm);
}
explicit RIS(Reg r) : ShiftAmount(r.ShiftAmount) {}
explicit RIS(Reg r) : ShiftAmount(ShiftAmount) { }
};
struct RRS

2
js/src/jit/arm/CodeGenerator-arm.cpp
View File

@ -1040,7 +1040,7 @@ CodeGeneratorARM::visitOutOfLineTableSwitch(OutOfLineTableSwitch *ool)
{
MTableSwitch *mir = ool->mir();
size_t numCases = mir->numCases();
int numCases = mir->numCases();
for (size_t i = 0; i < numCases; i++) {
LBlock *caseblock = mir->getCase(numCases - 1 - i)->lir();
Label *caseheader = caseblock->label();

3
js/src/jit/arm/MacroAssembler-arm.cpp
View File

@ -3103,7 +3103,10 @@ void
MacroAssemblerARMCompat::passABIArg(const MoveOperand &from)
{
MoveOperand to;
uint32_t increment = 1;
bool useResolver = true;
++passedArgs_;
Move::Kind kind = Move::GENERAL;
if (!enoughMemory_)
return;
if (from.isDouble()) {

2
js/src/jit/shared/IonAssemblerBufferWithConstantPools.h
View File

@ -52,7 +52,7 @@ struct Pool
Pool(int maxOffset_, int immSize_, int instSize_, int bias_, int alignment_, LifoAlloc &LifoAlloc_,
bool isBackref_ = false, bool canDedup_ = false, Pool *other_ = NULL)
: maxOffset(maxOffset_), immSize(immSize_), instSize(instSize_),
: maxOffset(maxOffset_), immSize(immSize_), instSize(instSize),
bias(bias_), alignment(alignment_),
isBackref(isBackref_), canDedup(canDedup_), other(other_),
poolData(static_cast<uint8_t *>(LifoAlloc_.alloc(8*immSize))), numEntries(0),

2
js/src/jsscript.cpp
View File

@ -164,7 +164,7 @@ Bindings::clone(JSContext *cx, InternalBindingsHandle self,
Bindings &src = srcScript->bindings;
ptrdiff_t off = (uint8_t *)src.bindingArray() - srcScript->data;
JS_ASSERT(off >= 0);
JS_ASSERT(size_t(off) <= srcScript->dataSize);
JS_ASSERT(off <= srcScript->dataSize);
Binding *dstPackedBindings = (Binding *)(dstScriptData + off);
/*