Bug 1144692: Fix --disable-ion builds; r=h4writer
authorBenjamin Bouvier <benj@benj.me>
Mon, 23 Mar 2015 07:59:36 +0100
changeset 263879 ec8f020d47ae5b0bd587dcf9f3d6a4cfa8be64f0
parent 263878 4dae2d1f59ff0c5e4bd799067331888fb2a3b999
child 263880 7d9bc7d1998456ec0a750473350b3c890e316ea6
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersh4writer
bugs1144692
milestone39.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1144692: Fix --disable-ion builds; r=h4writer
js/src/jit/CodeGenerator.cpp
js/src/jit/none/Architecture-none.h
js/src/jit/none/MacroAssembler-none.h
--- a/js/src/jit/CodeGenerator.cpp
+++ b/js/src/jit/CodeGenerator.cpp
@@ -3485,22 +3485,22 @@ CodeGenerator::visitCallDirectEvalV(LCal
     pushArg(ToValue(lir, LCallDirectEvalV::Argument));
     pushArg(ToValue(lir, LCallDirectEvalV::ThisValue));
     pushArg(ImmGCPtr(gen->info().script()));
     pushArg(scopeChain);
 
     callVM(DirectEvalValueInfo, lir);
 }
 
-// Registers safe for use before generatePrologue().
-static const uint32_t EntryTempMask = Registers::TempMask & ~(1 << OsrFrameReg.code());
-
 void
 CodeGenerator::generateArgumentsChecks(bool bailout)
 {
+    // Registers safe for use before generatePrologue().
+    static const uint32_t EntryTempMask = Registers::TempMask & ~(1 << OsrFrameReg.code());
+
     // This function can be used the normal way to check the argument types,
     // before entering the function and bailout when arguments don't match.
     // For debug purpose, this is can also be used to force/check that the
     // arguments are correct. Upon fail it will hit a breakpoint.
 
     MIRGraph &mir = gen->graph();
     MResumePoint *rp = mir.entryResumePoint();
 
--- a/js/src/jit/none/Architecture-none.h
+++ b/js/src/jit/none/Architecture-none.h
@@ -106,16 +106,17 @@ struct FloatRegister
     bool isDouble() const { MOZ_CRASH(); }
     bool isInt32x4() const { MOZ_CRASH(); }
     bool isFloat32x4() const { MOZ_CRASH(); }
     FloatRegister asSingle() const { MOZ_CRASH(); }
     FloatRegister asDouble() const { MOZ_CRASH(); }
     FloatRegister asInt32x4() const { MOZ_CRASH(); }
     FloatRegister asFloat32x4() const { MOZ_CRASH(); }
     Code code() const { MOZ_CRASH(); }
+    Encoding encoding() const { MOZ_CRASH(); }
     const char *name() const { MOZ_CRASH(); }
     bool volatile_() const { MOZ_CRASH(); }
     bool operator != (FloatRegister) const { MOZ_CRASH(); }
     bool operator == (FloatRegister) const { MOZ_CRASH(); }
     bool aliases(FloatRegister) const { MOZ_CRASH(); }
     uint32_t numAliased() const { MOZ_CRASH(); }
     void aliased(uint32_t, FloatRegister *) { MOZ_CRASH(); }
     bool equiv(FloatRegister) const { MOZ_CRASH(); }
--- a/js/src/jit/none/MacroAssembler-none.h
+++ b/js/src/jit/none/MacroAssembler-none.h
@@ -127,16 +127,22 @@ class Assembler : public AssemblerShared
     static void PatchInstructionImmediate(uint8_t *, PatchedImmPtr) { MOZ_CRASH(); }
     static int32_t ExtractCodeLabelOffset(uint8_t *) { MOZ_CRASH(); }
 
     static void ToggleToJmp(CodeLocationLabel) { MOZ_CRASH(); }
     static void ToggleToCmp(CodeLocationLabel) { MOZ_CRASH(); }
     static void ToggleCall(CodeLocationLabel, bool) { MOZ_CRASH(); }
 
     static uintptr_t GetPointer(uint8_t *) { MOZ_CRASH(); }
+
+    void verifyHeapAccessDisassembly(uint32_t begin, uint32_t end,
+                                     const Disassembler::HeapAccess &heapAccess)
+    {
+        MOZ_CRASH();
+    }
 };
 
 class Operand
 {
   public:
     Operand (const Address &) { MOZ_CRASH();}
 
 };