call ir_resolve_ptr_of_array_to_slice instead of recursing

Author: raulgrell

src/ir.cpp

@@ -10708,6 +10708,7 @@ static IrInstruction *ir_analyze_cast(IrAnalyze *ira, IrInstruction *source_inst
             actual_type->data.pointer.child_type->data.array.child_type, source_node,
             !wanted_child_type->data.pointer.is_const).id == ConstCastResultIdOk)
         {
+<<<<<<< HEAD
 <<<<<<< HEAD
             IrInstruction *cast1 = ir_resolve_ptr_of_array_to_unknown_len_ptr(ira, source_instr, value, wanted_child_type);
 =======
@@ -10716,6 +10717,9 @@ static IrInstruction *ir_analyze_cast(IrAnalyze *ira, IrInstruction *source_inst
                 return ira->codegen->invalid_instruction;
 
 >>>>>>> allow implicit cast from *[N]T to ?[*]T
+=======
+            IrInstruction *cast1 = ir_resolve_ptr_of_array_to_slice(ira, source_instr, value, wanted_child_type);
+>>>>>>> call ir_resolve_ptr_of_array_to_slice instead of recursing
             return ir_analyze_maybe_wrap(ira, source_instr, cast1, wanted_type);
         }
     }

test/cases/cast.zig

@@ -491,6 +491,10 @@ test "implicit cast from *[N]T to ?[*]T" {
   var y: [4]u16 = [4]u16 {0, 1, 2, 3};
 
   x = &y;
+<<<<<<< HEAD
+=======
+  assert(std.mem.eql(u16, x.?[0..4], y[0..4]));
+>>>>>>> call ir_resolve_ptr_of_array_to_slice instead of recursing
   x.?[0] = 8;
   y[3] = 6;
   assert(std.mem.eql(u16, x.?[0..4], y[0..4]));