diff options
| author | Björn Gustavsson <bjorn@erlang.org> | 2021-10-12 06:47:35 +0200 |
|---|---|---|
| committer | Björn Gustavsson <bjorn@erlang.org> | 2021-10-12 06:47:35 +0200 |
| commit | b0584c8d31bad9c0d624a57c32ce5d611766610a (patch) | |
| tree | d59acc05bf17530cbbc8f4613d075069a3b84168 | |
| parent | 3d66178ce85def7206b9c7ac1fa50fccf91c2a44 (diff) | |
| parent | b5565d9a6b7f7527969246adda52bd757438a8ed (diff) | |
| download | erlang-b0584c8d31bad9c0d624a57c32ce5d611766610a.tar.gz | |
Merge branch 'bjorn/erts/fortify-bs_add/OTP-17686' into maint
* bjorn/erts/fortify-bs_add/OTP-17686:
Improve argument testing in the bs_add instruction
| -rw-r--r-- | erts/emulator/beam/jit/x86/instr_bs.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/jit/x86/instr_bs.cpp b/erts/emulator/beam/jit/x86/instr_bs.cpp index 7df0b84cae..6e9fc79751 100644 --- a/erts/emulator/beam/jit/x86/instr_bs.cpp +++ b/erts/emulator/beam/jit/x86/instr_bs.cpp @@ -1407,8 +1407,8 @@ void BeamModuleAssembler::emit_bs_add(const ArgVal &Fail, a.and_(RETd, ARG1d); } } - a.and_(RETb, imm(_TAG_PRIMARY_MASK)); - a.cmp(RETb, imm(TAG_PRIMARY_IMMED1)); + a.and_(RETb, imm(_TAG_IMMED1_MASK)); + a.cmp(RETb, imm(_TAG_IMMED1_SMALL)); a.jne(fail); /* Verify that ARG2 >= 0 and multiply ARG2 by the unit. The |