v3_life: Eliminate special handling of guards

Remove the special handling #k_try{} in guards in v3_life. If we
introduce a new #k_protected{} record in v3_kernel, v3_life no longer
needs to know whether it is processing guards or bodies.

1 files changed, 9 insertions, 18 deletions

diff --git a/lib/compiler/src/v3_life.erl b/lib/compiler/src/v3_life.erl
index 1452b78d1d..65c2735a4c 100644
--- a/lib/compiler/src/v3_life.erl
+++ b/lib/compiler/src/v3_life.erl
@@ -78,9 +78,7 @@ function(#k_fdef{anno=#k{a=Anno},func=F,arity=Ar,vars=Vs,body=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,Anno}
     catch
 	Class:Error ->
@@ -106,12 +104,13 @@ body(Ke, I, Vdb0) ->
     E = expr(Ke, I, Vdb1),
     {[E],I,Vdb1}.
 
-%% guard(Kguard, I, Vdb) -> Guard.
+%% protected(Kprotected, I, Vdb) -> Protected.
+%%  Only used in guards.
 
-guard(#k_try{anno=A,arg=Ts,vars=[#k_var{name=X}],body=#k_var{name=X},
-	     handler=#k_atom{val=false},ret=Rs}, I, Vdb) ->
+protected(#k_protected{anno=A,arg=Ts,ret=Rs}, I, Vdb) ->
     %% Lock variables that are alive before try and used afterwards.
-    %% Don't lock variables that are only used inside the try expression.
+    %% Don't lock variables that are only used inside the protected
+    %% expression.
     Pdb0 = vdb_sub(I, I+1, Vdb),
     {T,MaxI,Pdb1} = body(Ts, I+1, Pdb0),
     Pdb2 = use_vars(A#k.ns, MaxI+1, Pdb1),	%Save "return" values
@@ -139,10 +138,9 @@ expr(#k_guard_match{anno=A,body=Kb,ret=Rs}, I, Vdb) ->
     M = match(Kb, A#k.us, I+1, [], Mdb),
     #l{ke={guard_match,M,var_list(Rs)},i=I,vdb=use_vars(A#k.us, I+1, Mdb),a=A#k.a};
 expr(#k_try{}=Try, I, Vdb) ->
-    case is_in_guard() of
-	false -> body_try(Try, I, Vdb);
-	true -> guard(Try, I, Vdb)
-    end;
+    body_try(Try, I, Vdb);
+expr(#k_protected{}=Protected, I, Vdb) ->
+    protected(Protected, I, Vdb);
 expr(#k_try_enter{anno=A,arg=Ka,vars=Vs,body=Kb,evars=Evs,handler=Kh}, I, Vdb) ->
     %% Lock variables that are alive before the catch and used afterwards.
     %% Don't lock variables that are only used inside the try.
@@ -303,9 +301,7 @@ val_clause(#k_val_clause{anno=A,val=V,body=Kb}, Ls0, I, Ctxt0, Vdb0) ->
 guard_clause(#k_guard_clause{anno=A,guard=Kg,body=Kb}, Ls, I, Ctxt, Vdb0) ->
     Vdb1 = use_vars(union(A#k.us, Ls), I+2, Vdb0),
     Gdb = vdb_sub(I+1, I+2, Vdb1),
-    OldRefc = put(guard_refc, get(guard_refc)+1),
-    G = guard(Kg, I+1, Gdb),
-    put(guard_refc, OldRefc),
+    G = protected(Kg, I+1, Gdb),
     B = match(Kb, Ls, I+2, Ctxt, Vdb1),
     #l{ke={guard_clause,G,B},
        i=I,vdb=use_vars((get_kanno(Kg))#k.us, I+2, Vdb1),
@@ -431,11 +427,6 @@ use_vars(Vs, I, Vdb) -> vdb_update_vars(Vs, Vdb, I).
 add_var(V, F, L, Vdb) ->
     vdb_store_new(V, {V,F,L}, Vdb).
 
-%% is_in_guard() -> true|false.
-
-is_in_guard() ->
-    get(guard_refc) > 0.
-
 %% vdb
 
 vdb_new(Vs) ->