diff options
| author | Björn Gustavsson <[email protected]> | 2018-04-25 10:34:26 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2018-04-25 10:34:26 +0200 |
| commit | 3682b7dab5a67843e54f0a93cc00a08b235c20c7 (patch) | |
| tree | ba8c5d7d660c3ab387e2d250cf520e1b784cf3d9 /lib/compiler/src | |
| parent | 0e669ed13e20d5d68aa617aacd807eca7268d070 (diff) | |
| parent | ad72c0d37ffb214cac874f51ac29fe2cdb47a2a4 (diff) | |
| download | otp-3682b7dab5a67843e54f0a93cc00a08b235c20c7.tar.gz otp-3682b7dab5a67843e54f0a93cc00a08b235c20c7.tar.bz2 otp-3682b7dab5a67843e54f0a93cc00a08b235c20c7.zip | |
Merge branch 'map-get-bif' of git://github.com/michalmuskala/otp
* 'map-get-bif' of git://github.com/michalmuskala/otp:
Introduce map_get guard-safe function
OTP-15037
Diffstat (limited to 'lib/compiler/src')
| -rw-r--r-- | lib/compiler/src/erl_bifs.erl | 1 | ||||
| -rw-r--r-- | lib/compiler/src/v3_codegen.erl | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/compiler/src/erl_bifs.erl b/lib/compiler/src/erl_bifs.erl index 8fab2400f7..70b36f029e 100644 --- a/lib/compiler/src/erl_bifs.erl +++ b/lib/compiler/src/erl_bifs.erl @@ -110,6 +110,7 @@ is_pure(erlang, list_to_pid, 1) -> true; is_pure(erlang, list_to_tuple, 1) -> true; is_pure(erlang, max, 2) -> true; is_pure(erlang, make_fun, 3) -> true; +is_pure(erlang, map_get, 2) -> true; is_pure(erlang, min, 2) -> true; is_pure(erlang, phash, 2) -> false; is_pure(erlang, pid_to_list, 1) -> true; diff --git a/lib/compiler/src/v3_codegen.erl b/lib/compiler/src/v3_codegen.erl index 8808c0a3b7..8e73b613a0 100644 --- a/lib/compiler/src/v3_codegen.erl +++ b/lib/compiler/src/v3_codegen.erl @@ -588,6 +588,7 @@ is_gc_bif(node, 1) -> false; is_gc_bif(element, 2) -> false; is_gc_bif(get, 1) -> false; is_gc_bif(tuple_size, 1) -> false; +is_gc_bif(map_get, 2) -> false; is_gc_bif(Bif, Arity) -> not (erl_internal:bool_op(Bif, Arity) orelse erl_internal:new_type_test(Bif, Arity) orelse |