2 files changed, 11 insertions, 12 deletions
diff --git a/lib/compiler/src/beam_ssa_pre_codegen.erl b/lib/compiler/src/beam_ssa_pre_codegen.erl
index 9b5f52d26b..36137ef046 100644
--- a/lib/compiler/src/beam_ssa_pre_codegen.erl
+++ b/lib/compiler/src/beam_ssa_pre_codegen.erl
@@ -23,11 +23,10 @@
 %% it has been annotated and transformed to help the code generator.
 %%
 %% * Some instructions are translated to other instructions closer to
-%% the BEAM instructions. For example, the put_tuple instruction is
-%% broken apart into the put_tuple_arity and put_tuple_elements
-%% instructions. Similary, the binary matching instructions are
-%% transformed from the optimization-friendly internal format to
-%% instruction more similar to the actual BEAM instructions.
+%% the BEAM instructions. For example, the binary matching
+%% instructions are transformed from the optimization-friendly
+%% internal format to instruction more similar to the actual BEAM
+%% instructions.
 %%
 %% * Blocks that will need an instruction for allocating a stack frame
 %% are annotated with a {frame_size,Size} annotation.
@@ -1010,11 +1009,11 @@ is_trap_bif(_, _, _) -> false.
 %%% used during matching.
 %%%
 %%% Depending on where variables are defined and used, they must
-%%% be handling in two different ways.
+%%% be handled in two different ways.
 %%%
 %%% Variables that are always defined in the receive (before branching
 %%% out into the different clauses of the receive) and used after the
-%%% receive, must be handled in the following way: Before each
+%%% receive must be handled in the following way: Before each
 %%% remove_message instruction, each such variable must be copied, and
 %%% all variables must be consolidated using a phi node in the
 %%% common exit block for the receive.
@@ -1715,7 +1714,7 @@ update_live_phis(_, _, Live) -> Live.
 %% reserve_yregs(St0) -> St.
 %%  In each block that allocates a stack frame, insert instructions
 %%  that copy variables that must be in Y registers (given by
-%%  YRegisters) to new variables.
+%%  the `yregs` annotation) to new variables.
 %%
 %%  Also allocate specific Y registers for try and catch tags.
 %%  The outermost try/catch tag is placed in y0, any directly
diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl
index 3d3fa10706..ca065295d6 100644
--- a/lib/compiler/src/beam_validator.erl
+++ b/lib/compiler/src/beam_validator.erl
@@ -592,7 +592,7 @@ valfun_4({bif,tuple_size,{f,Fail},[Tuple],Dst}=I, Vst0) ->
     TupleType0 = get_term_type(Tuple, Vst0),
     Vst1 = branch_state(Fail, Vst0),
     TupleType = upgrade_tuple_type({tuple,[0]}, TupleType0),
-    Vst = set_type(TupleType, Tuple, Vst1),
+    Vst = set_aliased_type(TupleType, Tuple, Vst1),
     set_type_reg_expr({integer,[]}, I, Dst, Vst);
 valfun_4({bif,element,{f,Fail},[Pos,Tuple],Dst}, Vst0) ->
     TupleType0 = get_term_type(Tuple, Vst0),
@@ -609,20 +609,20 @@ valfun_4(raw_raise=I, Vst) ->
 valfun_4({bif,map_get,{f,Fail},[_Key,Map]=Src,Dst}, Vst0) ->
     validate_src(Src, Vst0),
     Vst1 = branch_state(Fail, Vst0),
-    Vst = set_type(map, Map, Vst1),
+    Vst = set_aliased_type(map, Map, Vst1),
     Type = propagate_fragility(term, Src, Vst),
     set_type_reg(Type, Dst, Vst);
 valfun_4({bif,is_map_key,{f,Fail},[_Key,Map]=Src,Dst}, Vst0) ->
     validate_src(Src, Vst0),
     Vst1 = branch_state(Fail, Vst0),
-    Vst = set_type(map, Map, Vst1),
+    Vst = set_aliased_type(map, Map, Vst1),
     Type = propagate_fragility(bool, Src, Vst),
     set_type_reg(Type, Dst, Vst);
 valfun_4({bif,Op,{f,Fail},[Cons]=Src,Dst}, Vst0)
   when Op =:= hd; Op =:= tl ->
     validate_src(Src, Vst0),
     Vst1 = branch_state(Fail, Vst0),
-    Vst = set_type(cons, Cons, Vst1),
+    Vst = set_aliased_type(cons, Cons, Vst1),
     Type0 = bif_type(Op, Src, Vst),
     Type = propagate_fragility(Type0, Src, Vst),
     set_type_reg(Type, Dst, Vst);