a few more finally (see #7667)

src/codegen/codegen.ml

@@ -554,9 +554,7 @@ module UnificationCallback = struct
 		match e.eexpr with
 			| TFunction tf ->
 				tf_stack := tf :: !tf_stack;
-				let etf = {e with eexpr = TFunction({tf with tf_expr = run f tf.tf_expr})} in
-				tf_stack := List.tl !tf_stack;
-				etf
+				Std.finally (fun() -> tf_stack := List.tl !tf_stack) (fun() -> {e with eexpr = TFunction({tf with tf_expr = run f tf.tf_expr})}) ()
 			| _ ->
 				check (Type.map_expr (run ff) e)
 end;;

src/core/abstract.ml

@@ -74,9 +74,7 @@ let rec get_underlying_type a pl =
 			| _ ->
 				t
 		in
-		let t = loop t in
-		underlying_type_stack := List.tl !underlying_type_stack;
-		t
+		Std.finally (fun() -> underlying_type_stack := List.tl !underlying_type_stack) loop t
 	in
 	try
 		if not (Meta.has Meta.MultiType a.a_meta) then raise Not_found;