aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2019-06-17 13:37:36 +0200
committerJohn Högberg <[email protected]>2019-06-17 13:37:36 +0200
commit6b2fea0bfceada3ef0b45cf5a1ead291c45f2ccc (patch)
treef64a20909cdd25d741ab247f0c3f92aabfb5409d
parentc2344b1da074443770ae5ad2ef5523e4410ad216 (diff)
parenta3e094c4d58b614ba714559a62411b779e66f08a (diff)
downloadotp-6b2fea0bfceada3ef0b45cf5a1ead291c45f2ccc.tar.gz
otp-6b2fea0bfceada3ef0b45cf5a1ead291c45f2ccc.tar.bz2
otp-6b2fea0bfceada3ef0b45cf5a1ead291c45f2ccc.zip
Merge branch 'john/erts/fix-conservative/OTP-15881' into maint
* john/erts/fix-conservative/OTP-15881: erts: Relax the constraint introduced in OTP-15871
-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 e9107933f9..9d68a4a68b 100644
--- a/erts/emulator/beam/ops.tab
+++ b/erts/emulator/beam/ops.tab
@@ -703,7 +703,7 @@ get_tuple_element Reg=x P1 D1=x | \
get_tuple_element Reg=x P2 D2=x | \
get_tuple_element Reg=x P3 D3=x | \
succ(P1, P2) | succ(P2, P3) | succ(D1, D2) | succ(D2, D3) | \
- distinct(D1, Reg) | distinct(D2, Reg) | distinct(D3, Reg) => \
+ distinct(D1, Reg) | distinct(D2, Reg) => \
i_get_tuple_element3 Reg P1 D1
get_tuple_element Reg=x P1 D1=x | \