aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/bs_instrs.tab
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2019-03-27 15:32:29 +0100
committerJohn Högberg <[email protected]>2019-03-27 16:25:59 +0100
commit0398c6868940af8561d3401c00441071c57d7ac5 (patch)
treedb87851c6ed8ac495e2e77e27403144049b97fd0 /erts/emulator/beam/bs_instrs.tab
parentedb8aa4f76981c1f32c9b429f47ce30100126e58 (diff)
downloadotp-0398c6868940af8561d3401c00441071c57d7ac5.tar.gz
otp-0398c6868940af8561d3401c00441071c57d7ac5.tar.bz2
otp-0398c6868940af8561d3401c00441071c57d7ac5.zip
erts: Remove unsafe bs_get_binary2 optimization from loader
A load-time optimization assumed that match contexts had no further uses when a bs_get_binary2 overwrote the match context's register, and figured it would be safe to reuse the match context's memory for the resulting binary. This is no longer safe as of OTP 22, as a match context may be reused after being passed to another function.
Diffstat (limited to 'erts/emulator/beam/bs_instrs.tab')
-rw-r--r--erts/emulator/beam/bs_instrs.tab11
1 files changed, 0 insertions, 11 deletions
diff --git a/erts/emulator/beam/bs_instrs.tab b/erts/emulator/beam/bs_instrs.tab
index 652460a66d..9cad2b03c5 100644
--- a/erts/emulator/beam/bs_instrs.tab
+++ b/erts/emulator/beam/bs_instrs.tab
@@ -1136,7 +1136,6 @@ i_bs_get_utf16.execute(Fail, Flags, Dst) {
}
bs_context_to_binary := ctx_to_bin.fetch.execute;
-i_bs_get_binary_all_reuse := ctx_to_bin.fetch_bin.execute;
ctx_to_bin.head() {
Eterm context;
@@ -1159,16 +1158,6 @@ ctx_to_bin.fetch(Src) {
}
}
-ctx_to_bin.fetch_bin(Src, Fail, Unit) {
- context = $Src;
- mb = ms_matchbuffer(context);
- size = mb->size - mb->offset;
- if (size % $Unit != 0) {
- $FAIL($Fail);
- }
- offs = mb->offset;
-}
-
ctx_to_bin.execute() {
Uint hole_size;
Uint orig = mb->orig;