diff options
| author | John Högberg <[email protected]> | 2019-06-11 08:16:28 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2019-06-11 08:16:28 +0200 |
| commit | 915cea848908e486251f198a3c3e0f921bd4785f (patch) | |
| tree | f98c807893a53cc05748cf2011e899a8fc0dde9c /erts | |
| parent | 16309570f09b2bf2223ba537a7be09f1318b4718 (diff) | |
| parent | 50c9a2e0f0668bcdc0d2779d450d28bdd8c8926c (diff) | |
| download | otp-915cea848908e486251f198a3c3e0f921bd4785f.tar.gz otp-915cea848908e486251f198a3c3e0f921bd4785f.tar.bz2 otp-915cea848908e486251f198a3c3e0f921bd4785f.zip | |
Merge branch 'maint'
* maint:
erts: Fix bad loader optimization of get_tuple_element
beam_ssa_type: Fix incorrect bitstring unit determination
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/ops.tab | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab index 1beeb67c1f..c01b101023 100644 --- a/erts/emulator/beam/ops.tab +++ b/erts/emulator/beam/ops.tab @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1997-2018. All Rights Reserved. +# Copyright Ericsson AB 1997-2019. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -638,13 +638,18 @@ is_tuple NotTupleFail Tuple=x | is_tagged_tuple WrongRecordFail Tuple Arity Atom is_tagged_tuple_ff f? f? rx A a -get_tuple_element Reg=x P1 D1=x | get_tuple_element Reg=x P2 D2=x | \ +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) => i_get_tuple_element3 Reg P1 D1 - -get_tuple_element Reg=x P1 D1=x | get_tuple_element Reg=x P2 D2=x | \ - succ(P1, P2) | succ(D1, D2) => i_get_tuple_element2 Reg P1 D1 + succ(P1, P2) | succ(P2, P3) | succ(D1, D2) | succ(D2, D3) | \ + distinct(D1, Reg) | distinct(D2, Reg) | distinct(D3, Reg) => \ + i_get_tuple_element3 Reg P1 D1 + +get_tuple_element Reg=x P1 D1=x | \ + get_tuple_element Reg=x P2 D2=x | \ + succ(P1, P2) | succ(D1, D2) | \ + distinct(D1, Reg) => \ + i_get_tuple_element2 Reg P1 D1 get_tuple_element Reg=x P1 D1=x | get_tuple_element Reg=x P2 D2=x | \ succ(P1, P2) | distinct(D1, Reg) => i_get_tuple_element2_dst Reg P1 D1 D2 |