aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2018-08-13 10:28:55 +0200
committerGitHub <[email protected]>2018-08-13 10:28:55 +0200
commit1f89845db0b880b5b3599982223427cc16c411df (patch)
treeff2cf1ba554844b79feb99ad66f8e2a4b6cea892 /lib/stdlib
parenta79c54889fc0de5c3cd919fb08e93d98b819ba3c (diff)
parent7e1eb2ed1f724945884d839bd8a99154e9382849 (diff)
downloadotp-1f89845db0b880b5b3599982223427cc16c411df.tar.gz
otp-1f89845db0b880b5b3599982223427cc16c411df.tar.bz2
otp-1f89845db0b880b5b3599982223427cc16c411df.zip
Merge pull request #1919 from bjorng/bjorn/compiler/fix-is_map_key/OTP-15227
Correct error behavior of is_map_key/2 in guards
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/src/erl_internal.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl
index b311a843c2..939abaff00 100644
--- a/lib/stdlib/src/erl_internal.erl
+++ b/lib/stdlib/src/erl_internal.erl
@@ -74,6 +74,7 @@ guard_bif(element, 2) -> true;
guard_bif(float, 1) -> true;
guard_bif(floor, 1) -> true;
guard_bif(hd, 1) -> true;
+guard_bif(is_map_key, 2) -> true;
guard_bif(length, 1) -> true;
guard_bif(map_size, 1) -> true;
guard_bif(map_get, 2) -> true;
@@ -109,7 +110,6 @@ new_type_test(is_function, 2) -> true;
new_type_test(is_integer, 1) -> true;
new_type_test(is_list, 1) -> true;
new_type_test(is_map, 1) -> true;
-new_type_test(is_map_key, 2) -> true;
new_type_test(is_number, 1) -> true;
new_type_test(is_pid, 1) -> true;
new_type_test(is_port, 1) -> true;