From 2838a341f074dbc4597d90af86e2dda6647dd083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Fri, 24 Apr 2015 10:03:42 +0200
Subject: v3_core, v3_codegen: Eliminate old-style catches

---
 lib/compiler/src/v3_codegen.erl | 8 +++++---
 lib/compiler/src/v3_core.erl    | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/compiler/src/v3_codegen.erl b/lib/compiler/src/v3_codegen.erl
index 15a54a5886..aa2ebc0f85 100644
--- a/lib/compiler/src/v3_codegen.erl
+++ b/lib/compiler/src/v3_codegen.erl
@@ -2140,9 +2140,11 @@ put_stack(Val, [free|Stk]) -> [{Val}|Stk];
 put_stack(Val, [NotFree|Stk]) -> [NotFree|put_stack(Val, Stk)].
 
 put_stack_carefully(Val, Stk0) ->
-    case catch put_stack_carefully1(Val, Stk0) of
-	error -> error;
-	Stk1 when is_list(Stk1) -> Stk1
+    try
+	put_stack_carefully1(Val, Stk0)
+    catch
+	throw:error ->
+	    error
     end.
 
 put_stack_carefully1(_, []) -> throw(error);
diff --git a/lib/compiler/src/v3_core.erl b/lib/compiler/src/v3_core.erl
index ed7b55df07..2d12d832a3 100644
--- a/lib/compiler/src/v3_core.erl
+++ b/lib/compiler/src/v3_core.erl
@@ -869,10 +869,10 @@ constant_bin_1(Es) ->
 		 ({float,_,F}, B) -> {value,F,B};
 		 ({atom,_,undefined}, B) -> {value,undefined,B}
 	      end,
-    case catch eval_bits:expr_grp(Es, EmptyBindings, EvalFun) of
+    try eval_bits:expr_grp(Es, EmptyBindings, EvalFun) of
 	{value,Bin,EmptyBindings} ->
-	    Bin;
-	_ ->
+	    Bin
+    catch error:_ ->
 	    error
     end.
 
-- 
cgit v1.2.3