diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-08 07:48:28 +0000 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-08 07:48:28 +0000 |
| commit | ba9e648ce2705ad1c4679325a9326c47263e2a3e (patch) | |
| tree | 724cf5101a1b5923c235dc767b355a7b0e906eb7 /js/src/jit/arm/MacroAssembler-arm.cpp | |
| parent | c8300fbd6ae08925736c32f8b02c980ce1531f3f (diff) | |
| parent | 19c0f5e9ff625c6a67e5e0a08f0a800782168492 (diff) | |
| download | UXP-ba9e648ce2705ad1c4679325a9326c47263e2a3e.tar UXP-ba9e648ce2705ad1c4679325a9326c47263e2a3e.tar.gz UXP-ba9e648ce2705ad1c4679325a9326c47263e2a3e.tar.lz UXP-ba9e648ce2705ad1c4679325a9326c47263e2a3e.tar.xz UXP-ba9e648ce2705ad1c4679325a9326c47263e2a3e.zip | |
Merge branch 'master' into remove-unboxed
Diffstat (limited to 'js/src/jit/arm/MacroAssembler-arm.cpp')
| -rw-r--r-- | js/src/jit/arm/MacroAssembler-arm.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/js/src/jit/arm/MacroAssembler-arm.cpp b/js/src/jit/arm/MacroAssembler-arm.cpp index d40578514..a4161ab00 100644 --- a/js/src/jit/arm/MacroAssembler-arm.cpp +++ b/js/src/jit/arm/MacroAssembler-arm.cpp @@ -5012,7 +5012,10 @@ void MacroAssembler::patchCall(uint32_t callerOffset, uint32_t calleeOffset) { BufferOffset inst(callerOffset - 4); - as_bl(BufferOffset(calleeOffset).diffB<BOffImm>(inst), Always, inst); + BOffImm off = BufferOffset(calleeOffset).diffB<BOffImm>(inst); + MOZ_RELEASE_ASSERT(!off.isInvalid(), + "Failed to insert necessary far jump islands"); + as_bl(off, Always, inst); } CodeOffset |