aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/ops.tab
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2017-11-16 13:11:35 +0100
committerGitHub <[email protected]>2017-11-16 13:11:35 +0100
commit68dd05500dcad280417a2479f32fb6f7894ae712 (patch)
treee4bda059dea8ee0d3c3d94b635dae8423518a63a /erts/emulator/beam/ops.tab
parentf1bee5747a39adde2e8bab666d19c99a0069f5a9 (diff)
parent3679444fb654e9cba1252c6df0be5170e5388639 (diff)
downloadotp-68dd05500dcad280417a2479f32fb6f7894ae712.tar.gz
otp-68dd05500dcad280417a2479f32fb6f7894ae712.tar.bz2
otp-68dd05500dcad280417a2479f32fb6f7894ae712.zip
Merge pull request #1626 from bjorng/bjorn/erts/fix-receive-opt/ERL-511
Fix broken receive mark after an exception OTP-14782
Diffstat (limited to 'erts/emulator/beam/ops.tab')
-rw-r--r--erts/emulator/beam/ops.tab7
1 files changed, 6 insertions, 1 deletions
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab
index a560bde920..3df91056cb 100644
--- a/erts/emulator/beam/ops.tab
+++ b/erts/emulator/beam/ops.tab
@@ -1565,7 +1565,12 @@ on_load
#
# R14A.
#
-recv_mark f
+# Modified in OTP 21 because it turns out that we don't need the
+# label after all.
+#
+
+recv_mark f => i_recv_mark
+i_recv_mark
recv_set Fail | label Lbl | loop_rec Lf Reg => \
i_recv_set | label Lbl | loop_rec Lf Reg