diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-04-08 18:16:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-08 18:16:01 +0200 |
| commit | 6ac47e95318efb654682ed774fbbde1eb0fa2dd3 (patch) | |
| tree | 05e3594dc85fd66d29d122184157901fe7e51837 /js/src/jit/mips32/MacroAssembler-mips32.h | |
| parent | bf6bb142fc5bcb49b053788e06160af304f639e5 (diff) | |
| parent | bbd4001cb261cc54e2adf804ea7cbeb09078d7d9 (diff) | |
| download | UXP-6ac47e95318efb654682ed774fbbde1eb0fa2dd3.tar UXP-6ac47e95318efb654682ed774fbbde1eb0fa2dd3.tar.gz UXP-6ac47e95318efb654682ed774fbbde1eb0fa2dd3.tar.lz UXP-6ac47e95318efb654682ed774fbbde1eb0fa2dd3.tar.xz UXP-6ac47e95318efb654682ed774fbbde1eb0fa2dd3.zip | |
Merge pull request #94 from trav90/js-work
Fix Value::isGCThing footgun, stop returning true for NullValue
Diffstat (limited to 'js/src/jit/mips32/MacroAssembler-mips32.h')
| -rw-r--r-- | js/src/jit/mips32/MacroAssembler-mips32.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/src/jit/mips32/MacroAssembler-mips32.h b/js/src/jit/mips32/MacroAssembler-mips32.h index 4c7618d08..adb626bb0 100644 --- a/js/src/jit/mips32/MacroAssembler-mips32.h +++ b/js/src/jit/mips32/MacroAssembler-mips32.h @@ -480,8 +480,8 @@ class MacroAssemblerMIPSCompat : public MacroAssemblerMIPS void popValue(ValueOperand val); void pushValue(const Value& val) { push(Imm32(val.toNunboxTag())); - if (val.isMarkable()) - push(ImmGCPtr(val.toMarkablePointer())); + if (val.isGCThing()) + push(ImmGCPtr(val.toGCThing())); else push(Imm32(val.toNunboxPayload())); } |