From 88632d70cc866b5e54589ccb9311c7c5a88ecb46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 25 May 2016 07:06:55 +0200
Subject: beam_validator: Add is_bitstring/1 as a safe BIF

beam_validator wrongly complained that the following was
not safe because it didn't know that is_bitstring/1 is safe:

  food(Curriculum) ->
    [try
       is_bitstring(functions)
     catch _ ->
       0
     end, Curriculum].

While we are it, also add a new bif_SUITE test suite to cover some
more code in beam_validator.
---
 lib/compiler/src/beam_validator.erl |  1 +
 lib/compiler/test/Makefile          |  2 ++
 lib/compiler/test/bif_SUITE.erl     | 65 +++++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 lib/compiler/test/bif_SUITE.erl

diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl
index 1aab9de88e..1af17dc641 100644
--- a/lib/compiler/src/beam_validator.erl
+++ b/lib/compiler/src/beam_validator.erl
@@ -1523,6 +1523,7 @@ is_bif_safe('>=', 2) -> true;
 is_bif_safe(is_atom, 1) -> true;
 is_bif_safe(is_boolean, 1) -> true;
 is_bif_safe(is_binary, 1) -> true;
+is_bif_safe(is_bitstring, 1) -> true;
 is_bif_safe(is_float, 1) -> true;
 is_bif_safe(is_function, 1) -> true;
 is_bif_safe(is_integer, 1) -> true;
diff --git a/lib/compiler/test/Makefile b/lib/compiler/test/Makefile
index da4ea548fd..f0185acbc7 100644
--- a/lib/compiler/test/Makefile
+++ b/lib/compiler/test/Makefile
@@ -17,6 +17,7 @@ MODULES= \
 	beam_reorder_SUITE \
 	beam_type_SUITE \
 	beam_utils_SUITE \
+	bif_SUITE \
 	bs_bincomp_SUITE \
 	bs_bit_binaries_SUITE \
 	bs_construct_SUITE \
@@ -54,6 +55,7 @@ NO_OPT= \
 	beam_reorder \
 	beam_type \
 	beam_utils \
+	bif \
 	bs_construct \
         bs_match \
 	bs_utf \
diff --git a/lib/compiler/test/bif_SUITE.erl b/lib/compiler/test/bif_SUITE.erl
new file mode 100644
index 0000000000..51bc71da81
--- /dev/null
+++ b/lib/compiler/test/bif_SUITE.erl
@@ -0,0 +1,65 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2016. 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.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(bif_SUITE).
+
+-export([all/0,suite/0,groups/0,init_per_suite/1,end_per_suite/1,
+	 init_per_group/2,end_per_group/2,
+	 beam_validator/1]).
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    test_lib:recompile(?MODULE),
+    [{group,p}].
+
+groups() ->
+    [{p,[parallel],
+      [beam_validator
+      ]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+%% Cover code in beam_validator.
+
+beam_validator(Config) ->
+    [false,Config] = food(Config),
+
+    true = is_number(42.0),
+    false = is_port(Config),
+
+    ok.
+
+food(Curriculum) ->
+    [try
+	 is_bitstring(functions)
+     catch _ ->
+	     0
+     end, Curriculum].
-- 
cgit v1.2.3