diff options
| author | Björn Gustavsson <[email protected]> | 2016-05-30 12:26:28 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-05-30 12:26:28 +0200 |
| commit | c4ac159d055e36c0c7096f5038cc51c291b72771 (patch) | |
| tree | 54be49e65d3e18bd50dcbd4e6166d6aae8c9556c | |
| parent | 49ed8a5a1cddc806dd520aaa79e1a089194566c1 (diff) | |
| parent | d6d52477cdd6efefd3d3d93f4433b2b1f4e52ce7 (diff) | |
| download | otp-c4ac159d055e36c0c7096f5038cc51c291b72771.tar.gz otp-c4ac159d055e36c0c7096f5038cc51c291b72771.tar.bz2 otp-c4ac159d055e36c0c7096f5038cc51c291b72771.zip | |
Merge branch 'kostis/beam_disasm-entry-type/PR-1072'
* kostis/beam_disasm-entry-type/PR-1072:
Declare the type of function entry points
Export label() type
| -rw-r--r-- | lib/compiler/src/beam_disasm.erl | 5 | ||||
| -rw-r--r-- | lib/compiler/src/beam_disasm.hrl | 6 | ||||
| -rw-r--r-- | lib/stdlib/src/beam_lib.erl | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/lib/compiler/src/beam_disasm.erl b/lib/compiler/src/beam_disasm.erl index 5badcce696..c699672db1 100644 --- a/lib/compiler/src/beam_disasm.erl +++ b/lib/compiler/src/beam_disasm.erl @@ -314,10 +314,7 @@ get_funs({LsR0,[{func_info,[{atom,M}=AtomM,{atom,F}=AtomF,ArityArg]}|Code0]}) when is_atom(M), is_atom(F) -> Arity = resolve_arg_unsigned(ArityArg), {LsR,Code,RestCode} = get_fun(Code0, []), - Entry = case Code of - [{label,[{u,E}]}|_] -> E; - _ -> undefined - end, + [{label,[{u,Entry}]}|_] = Code, [#function{name=F, arity=Arity, entry=Entry, diff --git a/lib/compiler/src/beam_disasm.hrl b/lib/compiler/src/beam_disasm.hrl index e18214644f..d968cd9587 100644 --- a/lib/compiler/src/beam_disasm.hrl +++ b/lib/compiler/src/beam_disasm.hrl @@ -22,7 +22,9 @@ %% the system (e.g. in the translation from Beam to Icode). %% -%% XXX: THE FOLLOWING TYPE DECLARATION DOES NOT BELONG HERE... +%% XXX: THE FOLLOWING TYPE DECLARATION DOES NOT BELONG HERE. +%% IT SHOULD BE MOVED TO A FILE THAT DEFINES (AND EXPORTS) +%% PROPER TYPES FOR THE SET OF BEAM INSTRUCTIONS. %% -type beam_instr() :: 'bs_init_writable' | 'fclearerror' | 'if_end' | 'remove_message' | 'return' | 'send' | 'timeout' @@ -34,7 +36,7 @@ -record(function, {name :: atom(), arity :: byte(), - entry, %% unused ?? + entry :: beam_lib:label(), %% unnecessary ? code = [] :: [beam_instr()]}). -record(beam_file, {module :: module(), diff --git a/lib/stdlib/src/beam_lib.erl b/lib/stdlib/src/beam_lib.erl index 7a17226e46..fe9df601eb 100644 --- a/lib/stdlib/src/beam_lib.erl +++ b/lib/stdlib/src/beam_lib.erl @@ -46,7 +46,7 @@ terminate/2,code_change/3]). -export([make_crypto_key/2, get_crypto_key/1]). %Utilities used by compiler --export_type([attrib_entry/0, compinfo_entry/0, labeled_entry/0]). +-export_type([attrib_entry/0, compinfo_entry/0, labeled_entry/0, label/0]). -import(lists, [append/1, delete/2, foreach/2, keysort/2, member/2, reverse/1, sort/1, splitwith/2]). |