Consistently use #b_var{} instead of var_name()

We chose to refer to variables through their var_name() because we
anticipated the need to annotate them, but it turned out we didn't
really need that, and many things become a lot cleaner if the
entire #b_var{} is used to represent variables.

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/compiler/src/beam_ssa_pp.erl b/lib/compiler/src/beam_ssa_pp.erl
index 9daa2c2523..34ac08b32e 100644
--- a/lib/compiler/src/beam_ssa_pp.erl
+++ b/lib/compiler/src/beam_ssa_pp.erl
@@ -158,7 +158,7 @@ format_op({Prefix,Name}) ->
 format_op(Name) ->
     io_lib:format("~p", [Name]).
 
-format_register(#b_var{name=V}, #{registers:=Regs}) ->
+format_register(#b_var{}=V, #{registers:=Regs}) ->
     {Tag,N} = maps:get(V, Regs),
     io_lib:format("~p~p", [Tag,N]);
 format_register(_, #{}) -> "".
@@ -224,9 +224,9 @@ format_anno_1(Anno) ->
             [io_lib:format("  %% Anno: ~p\n", [Anno])]
     end.
 
-format_live_interval(#b_var{name=V}=Dst, #{live_intervals:=Intervals}) ->
+format_live_interval(#b_var{}=Dst, #{live_intervals:=Intervals}) ->
     case Intervals of
-        #{V:=Rs0} ->
+        #{Dst:=Rs0} ->
             Rs1 = [io_lib:format("~p..~p", [Start,End]) ||
                       {Start,End} <- Rs0],
             Rs = lists:join(" ", Rs1),