From 694cd826c34c1ae0f5a7aed79459edb102971934 Mon Sep 17 00:00:00 2001
From: Kostis Sagonas <kostis@it.uu.se>
Date: Fri, 27 May 2016 16:51:44 +0200
Subject: Define, export and use a hipe_icode:params() type

---
 lib/hipe/icode/hipe_icode.erl     | 14 ++++++++------
 lib/hipe/icode/hipe_icode.hrl     |  2 +-
 lib/hipe/icode/hipe_icode_cfg.erl |  3 +++
 3 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'lib/hipe')

diff --git a/lib/hipe/icode/hipe_icode.erl b/lib/hipe/icode/hipe_icode.erl
index 07d230491d..78508dff22 100644
--- a/lib/hipe/icode/hipe_icode.erl
+++ b/lib/hipe/icode/hipe_icode.erl
@@ -610,7 +610,9 @@
 %% Exported types
 %%
 
--export_type([icode/0]).
+-export_type([icode/0, params/0]).
+
+-type params() :: [icode_var()].
 
 %%---------------------------------------------------------------------
 %% 
@@ -618,7 +620,7 @@
 %%
 %%---------------------------------------------------------------------
 
--spec mk_icode(mfa(), [icode_var()], boolean(), boolean(), [icode_instr()],
+-spec mk_icode(mfa(), params(), boolean(), boolean(), [icode_instr()],
 	       {non_neg_integer(),non_neg_integer()}, 
 	       {icode_lbl(),icode_lbl()}) -> icode().
 mk_icode(Fun, Params, IsClosure, IsLeaf, Code, VarRange, LabelRange) ->
@@ -629,7 +631,7 @@ mk_icode(Fun, Params, IsClosure, IsLeaf, Code, VarRange, LabelRange) ->
 	 var_range=VarRange,
 	 label_range=LabelRange}.
 
--spec mk_icode(mfa(), [icode_var()], boolean(), boolean(), [icode_instr()],
+-spec mk_icode(mfa(), params(), boolean(), boolean(), [icode_instr()],
 	       hipe_consttab(), {non_neg_integer(),non_neg_integer()}, 
 	       {icode_lbl(),icode_lbl()}) -> icode().
 mk_icode(Fun, Params, IsClosure, IsLeaf, Code, Data, VarRange, LabelRange) ->
@@ -640,11 +642,11 @@ mk_icode(Fun, Params, IsClosure, IsLeaf, Code, Data, VarRange, LabelRange) ->
 -spec icode_fun(icode()) -> mfa().
 icode_fun(#icode{'fun' = MFA}) -> MFA.
 
--spec icode_params(icode()) -> [icode_var()].
+-spec icode_params(icode()) -> params().
 icode_params(#icode{params = Params}) -> Params.
 
--spec icode_params_update(icode(), [icode_var()]) -> icode().
-icode_params_update(Icode, Params) -> 
+-spec icode_params_update(icode(), params()) -> icode().
+icode_params_update(Icode, Params) ->
   Icode#icode{params = Params}.
 
 -spec icode_is_closure(icode()) -> boolean().
diff --git a/lib/hipe/icode/hipe_icode.hrl b/lib/hipe/icode/hipe_icode.hrl
index 999c54732b..b2e0d86b28 100644
--- a/lib/hipe/icode/hipe_icode.hrl
+++ b/lib/hipe/icode/hipe_icode.hrl
@@ -169,7 +169,7 @@
 %%---------------------------------------------------------------------
 
 -record(icode, {'fun'		:: mfa(),
-		params		:: [icode_var()],
+		params		:: hipe_icode:params(),
 		%% TODO: merge is_closure and closure_arity into one field
 		is_closure	:: boolean(),
 		closure_arity = none	:: 'none' | arity(),
diff --git a/lib/hipe/icode/hipe_icode_cfg.erl b/lib/hipe/icode/hipe_icode_cfg.erl
index b9969fa69d..9a602c0283 100644
--- a/lib/hipe/icode/hipe_icode_cfg.erl
+++ b/lib/hipe/icode/hipe_icode_cfg.erl
@@ -55,6 +55,9 @@
 -spec postorder(cfg()) -> [icode_lbl()].
 -spec reverse_postorder(cfg()) -> [icode_lbl()].
 
+-spec params(cfg()) -> hipe_icode:params().
+-spec params_update(cfg(), hipe_icode:params()) -> cfg().
+
 -spec is_visited(icode_lbl(), gb_sets:set()) -> boolean().
 -spec visit(icode_lbl(), gb_sets:set()) -> gb_sets:set().
 
-- 
cgit v1.2.3