aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2013-02-06 15:28:01 +0100
committerBjörn Gustavsson <[email protected]>2013-02-07 11:03:36 +0100
commit018350a42c1fe95e5143d3d0f4257e531ea37b76 (patch)
tree83bfb218174f395f760d8076da0df9a8d62f39ac
parent2ec63b31743a177446884ed12736607d3fbea1ef (diff)
downloadotp-018350a42c1fe95e5143d3d0f4257e531ea37b76.tar.gz
otp-018350a42c1fe95e5143d3d0f4257e531ea37b76.tar.bz2
otp-018350a42c1fe95e5143d3d0f4257e531ea37b76.zip
BEAM loader: Handle element(Pos, not_a_tuple)
The loader failed to load non-optimized BEAM code generated from: element(2, not_a_tuple) Commit ece4c17d2288a3161c995 introduced such code into core_fold_SUITE, leading to core_fold_no_opt_SUITE and core_fold_post_opt_SUITE failing to load.
-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 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