diff options
| author | Björn Gustavsson <[email protected]> | 2017-06-28 10:29:53 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2017-06-28 10:29:53 +0200 |
| commit | 9127542b815570cdbc526101caf36db2aa12e1bb (patch) | |
| tree | b11015d8a122069e2f3a3074e72bc3e8abfccf88 /erts | |
| parent | 9220cae08be45d783cb56f08bf87817f2cd680b6 (diff) | |
| parent | bbc8eb42959740930902b68d9a76fad424ca2e6a (diff) | |
| download | otp-9127542b815570cdbc526101caf36db2aa12e1bb.tar.gz otp-9127542b815570cdbc526101caf36db2aa12e1bb.tar.bz2 otp-9127542b815570cdbc526101caf36db2aa12e1bb.zip | |
Merge branch 'maint'
* maint:
Eliminate potential unsafe use of general destination
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/ops.tab | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab index cdf9cb58b9..44613c7d85 100644 --- a/erts/emulator/beam/ops.tab +++ b/erts/emulator/beam/ops.tab @@ -1174,9 +1174,9 @@ bs_get_binary2 Fail=f Ms=x Live=u Sz=sq Unit=u Flags=u Dst=d => \ %macro: i_bs_get_binary2 BsGetBinary_2 -fail_action %macro: i_bs_get_binary_all2 BsGetBinaryAll_2 -fail_action -i_bs_get_binary_imm2 f x I I I d -i_bs_get_binary2 f x I s I d -i_bs_get_binary_all2 f x I I d +i_bs_get_binary_imm2 f x I I I x +i_bs_get_binary2 f x I s I x +i_bs_get_binary_all2 f x I I x i_bs_get_binary_all_reuse x f I # Fetching float from binaries. @@ -1186,7 +1186,7 @@ bs_get_float2 Fail=f Ms=x Live=u Sz=s Unit=u Flags=u Dst=d => \ bs_get_float2 Fail=f Ms=x Live=u Sz=q Unit=u Flags=u Dst=d => jump Fail %macro: i_bs_get_float2 BsGetFloat2 -fail_action -i_bs_get_float2 f x I s I d +i_bs_get_float2 f x I s I x # Miscellanous |