diff options
| author | Björn Gustavsson <[email protected]> | 2013-02-10 08:00:20 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-02-10 08:00:20 +0100 |
| commit | f1e98d7c70457f85be52cefda73ec4f4d98f5822 (patch) | |
| tree | 689405777bafc0edcaa530de4e4b827ec05aba66 /erts | |
| parent | 4608e26cc382a7d23c6f96349dbf1a991f2c8807 (diff) | |
| parent | 018350a42c1fe95e5143d3d0f4257e531ea37b76 (diff) | |
| download | otp-f1e98d7c70457f85be52cefda73ec4f4d98f5822.tar.gz otp-f1e98d7c70457f85be52cefda73ec4f4d98f5822.tar.bz2 otp-f1e98d7c70457f85be52cefda73ec4f4d98f5822.zip | |
Merge branch 'bjorn/compiler/crash/OTP-10794'
* bjorn/compiler/crash/OTP-10794:
BEAM loader: Handle element(Pos, not_a_tuple)
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/ops.tab | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab index 6764e88c81..8a79b4910e 100644 --- a/erts/emulator/beam/ops.tab +++ b/erts/emulator/beam/ops.tab @@ -1021,7 +1021,7 @@ bif0 u$bif:erlang:node/0 Dst=d => node Dst bif1 Fail Bif=u$bif:erlang:get/1 Src=s Dst=d => i_get Src Dst -bif2 Jump=j u$bif:erlang:element/2 S1=s S2=s Dst=d => gen_element(Jump, S1, S2, Dst) +bif2 Jump=j u$bif:erlang:element/2 S1=s S2=rxy Dst=d => gen_element(Jump, S1, S2, Dst) bif1 Fail Bif Literal=q Dst => move Literal x | bif1 Fail Bif x Dst bif1 p Bif S1 Dst => bif1_body Bif S1 Dst |