From a0b0b09b078356dcc54113f085042c5deff9050d Mon Sep 17 00:00:00 2001
From: Mark Benvenuto <mark.benvenuto@mongodb.com>
Date: Thu, 17 Dec 2015 15:13:41 -0500
Subject: [PATCH] SERVER-21845 Fix debug non-jit builds of spidermonkey
---
.../mozjs-38/extract/js/src/jit/CodeGenerator.cpp | 6 +++---
.../mozjs-38/extract/js/src/jit/none/MacroAssembler-none.h | 6 ++++++
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/third_party/mozjs-38/extract/js/src/jit/CodeGenerator.cpp b/src/third_party/mozjs-38/extract/js/src/jit/CodeGenerator.cpp
index 82f9cf6869c..f04ef3fa2b0 100644
a
|
b
|
CodeGenerator::visitCallDirectEvalV(LCallDirectEvalV* lir)
|
3464 | 3464 | callVM(DirectEvalValueInfo, lir); |
3465 | 3465 | } |
3466 | 3466 | |
3467 | | // Registers safe for use before generatePrologue(). |
3468 | | static const uint32_t EntryTempMask = Registers::TempMask & ~(1 << OsrFrameReg.code()); |
3469 | | |
3470 | 3467 | void |
3471 | 3468 | CodeGenerator::generateArgumentsChecks(bool bailout) |
3472 | 3469 | { |
| 3470 | // Registers safe for use before generatePrologue(). |
| 3471 | static const uint32_t EntryTempMask = Registers::TempMask & ~(1 << OsrFrameReg.code()); |
| 3472 | |
3473 | 3473 | // This function can be used the normal way to check the argument types, |
3474 | 3474 | // before entering the function and bailout when arguments don't match. |
3475 | 3475 | // For debug purpose, this is can also be used to force/check that the |
diff --git a/src/third_party/mozjs-38/extract/js/src/jit/none/MacroAssembler-none.h b/src/third_party/mozjs-38/extract/js/src/jit/none/MacroAssembler-none.h
index 77ed4382749..ef1ec17d766 100644
a
|
b
|
class Assembler : public AssemblerShared
|
131 | 131 | static void ToggleCall(CodeLocationLabel, bool) { MOZ_CRASH(); } |
132 | 132 | |
133 | 133 | static uintptr_t GetPointer(uint8_t*) { MOZ_CRASH(); } |
| 134 | |
| 135 | void verifyHeapAccessDisassembly(uint32_t begin, uint32_t end, |
| 136 | const Disassembler::HeapAccess &heapAccess) |
| 137 | { |
| 138 | MOZ_CRASH(); |
| 139 | } |
134 | 140 | }; |
135 | 141 | |
136 | 142 | class Operand |