From 7d2981f0896113d6dce20c777bbadbbb1d641554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 17 Mar 2010 16:39:05 +0000
Subject: compiler: Provide more information if the v3_life pass crashes

Print the name and arity of the function being compiled
if the v3_life compiler pass crashes to facilitate finding
out which part of the source code that triggered the problem.
---
 lib/compiler/src/v3_life.erl | 46 +++++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 20 deletions(-)

(limited to 'lib')

diff --git a/lib/compiler/src/v3_life.erl b/lib/compiler/src/v3_life.erl
index 0adeaca8fa..8e6b153d57 100644
--- a/lib/compiler/src/v3_life.erl
+++ b/lib/compiler/src/v3_life.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1999-2010. All Rights Reserved.
+%%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 %% Purpose : Convert annotated kernel expressions to annotated beam format.
@@ -66,21 +66,27 @@ functions([], Acc) -> reverse(Acc).
 %% function(Kfunc) -> Func.
 
 function(#k_fdef{func=F,arity=Ar,vars=Vs,body=Kb}) ->
-    %ok = io:fwrite("life ~w: ~p~n~p~n", [?LINE,{F,Ar},Kb]),
-    As = var_list(Vs),
-    Vdb0 = foldl(fun ({var,N}, Vdb) -> new_var(N, 0, Vdb) end, [], As),
-    %% Force a top-level match!
-    B0 = case Kb of
-	     #k_match{} -> Kb;
-	     _ ->
-		 Ka = get_kanno(Kb),
-		 #k_match{anno=#k{us=Ka#k.us,ns=[],a=Ka#k.a},
-			  vars=Vs,body=Kb,ret=[]}
-	 end,
-    put(guard_refc, 0),
-    {B1,_,Vdb1} = body(B0, 1, Vdb0),
-    erase(guard_refc),
-    {function,F,Ar,As,B1,Vdb1}.
+    try
+	As = var_list(Vs),
+	Vdb0 = foldl(fun ({var,N}, Vdb) -> new_var(N, 0, Vdb) end, [], As),
+	%% Force a top-level match!
+	B0 = case Kb of
+		 #k_match{} -> Kb;
+		 _ ->
+		     Ka = get_kanno(Kb),
+		     #k_match{anno=#k{us=Ka#k.us,ns=[],a=Ka#k.a},
+			      vars=Vs,body=Kb,ret=[]}
+	     end,
+	put(guard_refc, 0),
+	{B1,_,Vdb1} = body(B0, 1, Vdb0),
+	erase(guard_refc),
+	{function,F,Ar,As,B1,Vdb1}
+    catch
+	Class:Error ->
+	    Stack = erlang:get_stacktrace(),
+	    io:fwrite("Function: ~w/~w\n", [F,Ar]),
+	    erlang:raise(Class, Error, Stack)
+    end.
 
 %% body(Kbody, I, Vdb) -> {[Expr],MaxI,Vdb}.
 %%  Handle a body, need special cases for transforming match_fails.
-- 
cgit v1.2.3