From 0d513d758b7c5ae38d2da7bb030a38a589b6286d Mon Sep 17 00:00:00 2001 From: Chris Peterson Date: Sat, 9 Aug 2014 00:39:31 -0700 Subject: [PATCH] Backed out changeset a8e3534959ba for incorrect bug number --- js/src/jit/x86/Assembler-x86.cpp | 2 +- js/src/jit/x86/Assembler-x86.h | 8 ++++---- js/src/jit/x86/Bailouts-x86.cpp | 2 +- js/src/jit/x86/BaselineIC-x86.cpp | 4 ++-- js/src/jit/x86/CodeGenerator-x86.cpp | 6 +++--- js/src/jit/x86/Lowering-x86.cpp | 6 +++--- js/src/jit/x86/MacroAssembler-x86.cpp | 2 +- js/src/jit/x86/MacroAssembler-x86.h | 2 +- js/src/jit/x86/Trampoline-x86.cpp | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/js/src/jit/x86/Assembler-x86.cpp b/js/src/jit/x86/Assembler-x86.cpp index 01c389314e2f..13dc365615a7 100644 --- a/js/src/jit/x86/Assembler-x86.cpp +++ b/js/src/jit/x86/Assembler-x86.cpp @@ -30,7 +30,7 @@ ABIArgGenerator::next(MIRType type) stackOffset_ += sizeof(uint64_t); break; default: - MOZ_CRASH("Unexpected argument type"); + MOZ_ASSUME_UNREACHABLE("Unexpected argument type"); } return current_; } diff --git a/js/src/jit/x86/Assembler-x86.h b/js/src/jit/x86/Assembler-x86.h index ee55bb6fd3dc..90b4ee350bce 100644 --- a/js/src/jit/x86/Assembler-x86.h +++ b/js/src/jit/x86/Assembler-x86.h @@ -248,7 +248,7 @@ class Assembler : public AssemblerX86Shared writeDataRelocation(ptr); break; default: - MOZ_CRASH("unexpected operand kind"); + MOZ_ASSUME_UNREACHABLE("unexpected operand kind"); } } void movl(ImmWord imm, Register dest) { @@ -305,7 +305,7 @@ class Assembler : public AssemblerX86Shared masm.fld32_m(dest.disp(), dest.base()); break; default: - MOZ_CRASH("unexpected operand kind"); + MOZ_ASSUME_UNREACHABLE("unexpected operand kind"); } } @@ -315,7 +315,7 @@ class Assembler : public AssemblerX86Shared masm.fstp32_m(src.disp(), src.base()); break; default: - MOZ_CRASH("unexpected operand kind"); + MOZ_ASSUME_UNREACHABLE("unexpected operand kind"); } } @@ -347,7 +347,7 @@ class Assembler : public AssemblerX86Shared writeDataRelocation(imm); break; default: - MOZ_CRASH("unexpected operand kind"); + MOZ_ASSUME_UNREACHABLE("unexpected operand kind"); } } void cmpl(AsmJSAbsoluteAddress lhs, Register rhs) { diff --git a/js/src/jit/x86/Bailouts-x86.cpp b/js/src/jit/x86/Bailouts-x86.cpp index 7e372d403bc7..aab1f2af3126 100644 --- a/js/src/jit/x86/Bailouts-x86.cpp +++ b/js/src/jit/x86/Bailouts-x86.cpp @@ -80,7 +80,7 @@ IonBailoutIterator::IonBailoutIterator(const JitActivationIterator &activations, switch (mode_) { case SequentialExecution: topIonScript_ = script()->ionScript(); break; case ParallelExecution: topIonScript_ = script()->parallelIonScript(); break; - default: MOZ_CRASH("No such execution mode"); + default: MOZ_ASSUME_UNREACHABLE("No such execution mode"); } if (bailout->frameClass() == FrameSizeClass::None()) { diff --git a/js/src/jit/x86/BaselineIC-x86.cpp b/js/src/jit/x86/BaselineIC-x86.cpp index 5488a6a4ca4f..c220711c7573 100644 --- a/js/src/jit/x86/BaselineIC-x86.cpp +++ b/js/src/jit/x86/BaselineIC-x86.cpp @@ -191,7 +191,7 @@ ICBinaryArith_Int32::Compiler::generateStubCode(MacroAssembler &masm) } break; default: - MOZ_CRASH("Unhandled op for BinaryArith_Int32."); + MOZ_ASSUME_UNREACHABLE("Unhandled op for BinaryArith_Int32. "); } // Return. @@ -252,7 +252,7 @@ ICUnaryArith_Int32::Compiler::generateStubCode(MacroAssembler &masm) masm.negl(R0.payloadReg()); break; default: - MOZ_CRASH("Unexpected op"); + MOZ_ASSUME_UNREACHABLE("Unexpected op"); } EmitReturnFromIC(masm); diff --git a/js/src/jit/x86/CodeGenerator-x86.cpp b/js/src/jit/x86/CodeGenerator-x86.cpp index 35339a75a0d7..4a91a073c64e 100644 --- a/js/src/jit/x86/CodeGenerator-x86.cpp +++ b/js/src/jit/x86/CodeGenerator-x86.cpp @@ -280,7 +280,7 @@ CodeGeneratorX86::loadViewTypeElement(Scalar::Type vt, const T &srcAddr, case Scalar::Uint32: masm.movlWithPatch(srcAddr, ToRegister(out)); break; case Scalar::Float32: masm.movssWithPatch(srcAddr, ToFloatRegister(out)); break; case Scalar::Float64: masm.movsdWithPatch(srcAddr, ToFloatRegister(out)); break; - default: MOZ_CRASH("unexpected array type"); + default: MOZ_ASSUME_UNREACHABLE("unexpected array type"); } } @@ -385,7 +385,7 @@ CodeGeneratorX86::storeViewTypeElement(Scalar::Type vt, const LAllocation *value case Scalar::Uint32: masm.movlWithPatch(ToRegister(value), dstAddr); break; case Scalar::Float32: masm.movssWithPatch(ToFloatRegister(value), dstAddr); break; case Scalar::Float64: masm.movsdWithPatch(ToFloatRegister(value), dstAddr); break; - default: MOZ_CRASH("unexpected array type"); + default: MOZ_ASSUME_UNREACHABLE("unexpected array type"); } } @@ -544,7 +544,7 @@ DispatchIonCache::initializeAddCacheState(LInstruction *ins, AddCacheState *addS { // On x86, where there is no general purpose scratch register available, // child cache classes must manually specify a dispatch scratch register. - MOZ_CRASH("x86 needs manual assignment of dispatchScratch"); + MOZ_ASSUME_UNREACHABLE("x86 needs manual assignment of dispatchScratch"); } void diff --git a/js/src/jit/x86/Lowering-x86.cpp b/js/src/jit/x86/Lowering-x86.cpp index ac7b8912a7f0..8dbbfa5aaef3 100644 --- a/js/src/jit/x86/Lowering-x86.cpp +++ b/js/src/jit/x86/Lowering-x86.cpp @@ -254,7 +254,7 @@ LIRGeneratorX86::visitAsmJSStoreHeap(MAsmJSStoreHeap *ins) // See comment below. lir = new(alloc()) LAsmJSStoreHeap(ptrAlloc, useRegisterAtStart(ins->value())); break; - default: MOZ_CRASH("unexpected array type"); + default: MOZ_ASSUME_UNREACHABLE("unexpected array type"); } return add(lir, ins); } @@ -271,7 +271,7 @@ LIRGeneratorX86::visitAsmJSStoreHeap(MAsmJSStoreHeap *ins) // affects instruction layout which affects patching. lir = new(alloc()) LAsmJSStoreHeap(useRegisterAtStart(ptr), useRegisterAtStart(ins->value())); break; - default: MOZ_CRASH("unexpected array type"); + default: MOZ_ASSUME_UNREACHABLE("unexpected array type"); } return add(lir, ins); @@ -295,7 +295,7 @@ LIRGeneratorX86::visitStoreTypedArrayElementStatic(MStoreTypedArrayElementStatic lir = new(alloc()) LStoreTypedArrayElementStatic(useRegisterAtStart(ins->ptr()), useRegisterAtStart(ins->value())); break; - default: MOZ_CRASH("unexpected array type"); + default: MOZ_ASSUME_UNREACHABLE("unexpected array type"); } return add(lir, ins); diff --git a/js/src/jit/x86/MacroAssembler-x86.cpp b/js/src/jit/x86/MacroAssembler-x86.cpp index 0c46c7e2f3a6..b71a84ad15ab 100644 --- a/js/src/jit/x86/MacroAssembler-x86.cpp +++ b/js/src/jit/x86/MacroAssembler-x86.cpp @@ -173,7 +173,7 @@ MacroAssemblerX86::passABIArg(const MoveOperand &from, MoveOp::Type type) case MoveOp::DOUBLE: stackForCall_ += sizeof(double); break; case MoveOp::INT32: stackForCall_ += sizeof(int32_t); break; case MoveOp::GENERAL: stackForCall_ += sizeof(intptr_t); break; - default: MOZ_CRASH("Unexpected argument type"); + default: MOZ_ASSUME_UNREACHABLE("Unexpected argument type"); } enoughMemory_ &= moveResolver_.addMove(from, to, type); } diff --git a/js/src/jit/x86/MacroAssembler-x86.h b/js/src/jit/x86/MacroAssembler-x86.h index a3bd5181c6da..f5ea5d3c4592 100644 --- a/js/src/jit/x86/MacroAssembler-x86.h +++ b/js/src/jit/x86/MacroAssembler-x86.h @@ -102,7 +102,7 @@ class MacroAssemblerX86 : public MacroAssemblerX86Shared base.scale(), base.disp() + sizeof(void *)); default: - MOZ_CRASH("unexpected operand kind"); + MOZ_ASSUME_UNREACHABLE("unexpected operand kind"); } } Address ToType(Address base) { diff --git a/js/src/jit/x86/Trampoline-x86.cpp b/js/src/jit/x86/Trampoline-x86.cpp index 787308b8f79f..fb9ec21e18ef 100644 --- a/js/src/jit/x86/Trampoline-x86.cpp +++ b/js/src/jit/x86/Trampoline-x86.cpp @@ -575,7 +575,7 @@ JitRuntime::generateBailoutHandler(JSContext *cx, ExecutionMode mode) GenerateParallelBailoutThunk(masm, NO_FRAME_SIZE_CLASS_ID); break; default: - MOZ_CRASH("No such execution mode"); + MOZ_ASSUME_UNREACHABLE("No such execution mode"); } Linker linker(masm); @@ -711,7 +711,7 @@ JitRuntime::generateVMWrapper(JSContext *cx, const VMFunction &f) masm.j(Assembler::Zero, masm.failureLabel(f.executionMode)); break; default: - MOZ_CRASH("unknown failure kind"); + MOZ_ASSUME_UNREACHABLE("unknown failure kind"); } // Load the outparam and free any allocated stack.