From 17735c9f3879145f43a3e4be0369b7117b1b7b84 Mon Sep 17 00:00:00 2001
From: Steve Vinoski <vinoski@ieee.org>
Date: Wed, 6 May 2015 23:15:04 -0400
Subject: Add enif_raise_exception

Add enif_raise_exception function to allow NIFs to raise error
exceptions holding any Erlang terms. This does not replace or
deprecate the enif_make_badarg function, though, because raising
badarg errors is so idiomatic in NIFs. Reimplement enif_make_badarg on
top of enif_raise_exception. Add new tests for enif_raise_exception
for both normal and dirty NIFs. Add documentation for
enif_raise_exception.
---
 erts/emulator/test/nif_SUITE.erl | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

(limited to 'erts/emulator/test/nif_SUITE.erl')

diff --git a/erts/emulator/test/nif_SUITE.erl b/erts/emulator/test/nif_SUITE.erl
index 434d1c38d0..778f6fd087 100644
--- a/erts/emulator/test/nif_SUITE.erl
+++ b/erts/emulator/test/nif_SUITE.erl
@@ -39,8 +39,9 @@
 	 get_length/1, make_atom/1, make_string/1, reverse_list_test/1,
 	 otp_9828/1,
 	 otp_9668/1, consume_timeslice/1, dirty_nif/1, dirty_nif_send/1,
-	 dirty_nif_exception/1, nif_schedule/1,
-	 nif_exception/1, nif_nan_and_inf/1, nif_atom_too_long/1
+	 dirty_nif_exception/1, call_dirty_nif_exception/1, nif_schedule/1,
+	 nif_exception/1, call_nif_exception/1,
+	 nif_nan_and_inf/1, nif_atom_too_long/1
 	]).
 
 -export([many_args_100/100]).
@@ -1621,7 +1622,10 @@ dirty_nif_exception(Config) when is_list(Config) ->
 		    [{?MODULE,call_dirty_nif_exception,[0],_}|_] =
 			erlang:get_stacktrace(),
 		    ok
-	    end
+	    end,
+	    %% this checks that a dirty NIF can raise various terms as
+	    %% exceptions
+	    ok = nif_raise_exceptions(call_dirty_nif_exception)
     catch
 	error:badarg ->
 	    {skipped,"No dirty scheduler support"}
@@ -1633,12 +1637,15 @@ nif_exception(Config) when is_list(Config) ->
 	%% this checks that the expected exception occurs when the NIF
 	%% calls enif_make_badarg at some point but then tries to return a
 	%% value that isn't an exception
-	call_nif_exception(),
+	call_nif_exception(0),
 	?t:fail(expected_badarg)
     catch
 	error:badarg ->
 	    ok
-    end.
+    end,
+    %% this checks that a NIF can raise various terms as exceptions
+    ok = nif_raise_exceptions(call_nif_exception),
+    ok.
 
 nif_nan_and_inf(Config) when is_list(Config) ->
     ensure_lib_loaded(Config),
@@ -1760,7 +1767,20 @@ check(Exp,Got,Line) ->
   	    io:format("CHECK at ~p: Expected ~p but got ~p\n",[Line,Exp,Got]),
  	    Got
     end.
-	    
+
+nif_raise_exceptions(NifFunc) ->
+    ExcTerms = [{error, test}, "a string", <<"a binary">>,
+		42, [1,2,3,4,5], [{p,1},{p,2},{p,3}]],
+    lists:foldl(fun(Term, ok) ->
+			try
+			    erlang:apply(?MODULE,NifFunc,[Term]),
+			    ?t:fail({expected,Term})
+			catch
+			    error:Term ->
+				[{?MODULE,NifFunc,[Term],_}|_] = erlang:get_stacktrace(),
+				ok
+			end
+		end, ok, ExcTerms).
 
 %% The NIFs:
 lib_version() -> undefined.
@@ -1816,7 +1836,7 @@ call_dirty_nif(_,_,_) -> ?nif_stub.
 send_from_dirty_nif(_) -> ?nif_stub.
 call_dirty_nif_exception(_) -> ?nif_stub.
 call_dirty_nif_zero_args() -> ?nif_stub.
-call_nif_exception() -> ?nif_stub.
+call_nif_exception(_) -> ?nif_stub.
 call_nif_nan_or_inf(_) -> ?nif_stub.
 call_nif_atom_too_long(_) -> ?nif_stub.
 
-- 
cgit v1.2.3