diff options
| author | Moonchild <moonchild@palemoon.org> | 2019-10-12 19:19:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-12 19:19:50 +0200 |
| commit | 5a6f737e176a074140b4119515d5af108ad1c76f (patch) | |
| tree | 6da2497b81c6f36086a6587cad6f25835d47427d | |
| parent | 1a86abc159e788c40ebdfc6a99c9143d168737af (diff) | |
| parent | a68a09618787980ff58b248c484b4017e3d2e663 (diff) | |
| download | UXP-5a6f737e176a074140b4119515d5af108ad1c76f.tar UXP-5a6f737e176a074140b4119515d5af108ad1c76f.tar.gz UXP-5a6f737e176a074140b4119515d5af108ad1c76f.tar.lz UXP-5a6f737e176a074140b4119515d5af108ad1c76f.tar.xz UXP-5a6f737e176a074140b4119515d5af108ad1c76f.zip | |
Merge pull request #1246 from dimag0g/master
Replace calls to undefined functions isMarkable() and toMarkablePointer()
| -rw-r--r-- | js/src/jit/arm/MacroAssembler-arm.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/src/jit/arm/MacroAssembler-arm.cpp b/js/src/jit/arm/MacroAssembler-arm.cpp index a4161ab00..3421001f7 100644 --- a/js/src/jit/arm/MacroAssembler-arm.cpp +++ b/js/src/jit/arm/MacroAssembler-arm.cpp @@ -3462,8 +3462,8 @@ MacroAssemblerARMCompat::storePayload(const Value& val, const Address& dest) ScratchRegisterScope scratch(asMasm()); SecondScratchRegisterScope scratch2(asMasm()); - if (val.isMarkable()) - ma_mov(ImmGCPtr(val.toMarkablePointer()), scratch); + if (val.isGCThing()) + ma_mov(ImmGCPtr(val.toGCThing()), scratch); else ma_mov(Imm32(val.toNunboxPayload()), scratch); ma_str(scratch, ToPayload(dest), scratch2); |