aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2018-09-03 09:51:52 +0200
committerBjörn Gustavsson <[email protected]>2018-09-03 09:51:52 +0200
commit31e7b5ab0b72acbbca649b99ade82bba145cc390 (patch)
tree5b49c6acb97ccbd5daadf2ad1d2301582ea7b8cc /erts
parent869537a9bf799c8d12fc46c2b413e532d6e3b10c (diff)
parent5801fcb2b36e04c433dcf0b90a8c47b86e34fc07 (diff)
downloadotp-31e7b5ab0b72acbbca649b99ade82bba145cc390.tar.gz
otp-31e7b5ab0b72acbbca649b99ade82bba145cc390.tar.bz2
otp-31e7b5ab0b72acbbca649b99ade82bba145cc390.zip
Merge branch 'maint'
* maint: ops.tab: Fix potentially unsafe optimization of raise/2
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/ops.tab2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab
index 5942a7e6bf..d71594235e 100644
--- a/erts/emulator/beam/ops.tab
+++ b/erts/emulator/beam/ops.tab
@@ -244,7 +244,7 @@ if_end
# Optimize for that case.
raise x==2 x==1 => i_raise
raise Trace=y Value=y => move Trace x=2 | move Value x=1 | i_raise
-raise Trace Value => move Trace x=3 | move Value x=1 | move x=3 x=2 | i_raise
+raise Trace Value => move Trace x | move Value x=1 | move x x=2 | i_raise
i_raise