# Conflicts:
#	Makefile
#	ctest/final_performance/large_loop_array_1.out
#	ctest/final_performance/vector_mul1.out
#	ctest/functional/00_main.out
#	ctest/functional/01_var_defn2.out
#	ctest/functional/02_var_defn3.out
#	ctest/functional/03_arr_defn2.out
#	ctest/functional/04_arr_defn3.out
#	ctest/functional/05_arr_defn4.out
#	ctest/functional/06_const_var_defn2.out
#	ctest/functional/07_const_var_defn3.out
#	ctest/functional/08_const_array_defn.out
#	ctest/functional/09_func_defn.out
#	ctest/functional/10_var_defn_func.out
#	ctest/functional/11_add2.out
#	ctest/functional/12_addc.out
#	ctest/functional/13_sub2.out
#	ctest/functional/14_subc.out
#	ctest/functional/15_mul.out
#	ctest/functional/16_mulc.out
#	ctest/functional/17_div.out
#	ctest/functional/18_divc.out
#	ctest/functional/19_mod.out
#	ctest/functional/20_rem.out
#	ctest/functional/21_if_test2.out
#	ctest/functional/22_if_test3.out
#	ctest/functional/23_if_test4.out
#	ctest/functional/24_if_test5.out
#	ctest/functional/25_while_if.out
#	ctest/functional/26_while_test1.out
#	ctest/functional/27_while_test2.out
#	ctest/functional/28_while_test3.out
#	ctest/functional/29_break.out
#	ctest/functional/30_continue.out
#	ctest/functional/31_while_if_test1.out
#	ctest/functional/32_while_if_test2.out
#	ctest/functional/33_while_if_test3.out
#	ctest/functional/35_op_priority1.out
#	ctest/functional/36_op_priority2.out
#	ctest/functional/37_op_priority3.out
#	ctest/functional/38_op_priority4.out
#	ctest/functional/39_op_priority5.out
#	ctest/functional/40_unary_op.out
#	ctest/functional/41_unary_op2.out
#	ctest/functional/42_empty_stmt.out
#	ctest/functional/43_logi_assign.out
#	ctest/functional/44_stmt_expr.out
#	ctest/functional/45_comment1.out
#	ctest/functional/46_hex_defn.out
#	ctest/functional/47_hex_oct_add.out
#	ctest/functional/48_assign_complex_expr.out
#	ctest/functional/49_if_complex_expr.out
#	ctest/functional/50_short_circuit.out
#	ctest/functional/51_short_circuit3.out
#	ctest/functional/52_scope.out
#	ctest/functional/53_scope2.out
#	ctest/functional/55_sort_test1.out
#	ctest/functional/56_sort_test2.out
#	ctest/functional/57_sort_test3.out
#	ctest/functional/58_sort_test4.out
#	ctest/functional/59_sort_test5.out
#	ctest/functional/60_sort_test6.out
#	ctest/functional/61_sort_test7.out
#	ctest/functional/62_percolation.out
#	ctest/functional/63_big_int_mul.out
#	ctest/functional/64_calculator.out
#	ctest/functional/65_color.out
#	ctest/functional/66_exgcd.out
#	ctest/functional/67_reverse_output.out
#	ctest/functional/68_brainfk.out
#	ctest/functional/69_expr_eval.out
#	ctest/functional/70_dijkstra.out
#	ctest/functional/71_full_conn.out
#	ctest/functional/72_hanoi.out
#	ctest/functional/73_int_io.out
#	ctest/functional/74_kmp.out
#	ctest/functional/75_max_flow.out
#	ctest/functional/76_n_queens.out
#	ctest/functional/77_substr.out
#	ctest/functional/78_side_effect.out
#	ctest/functional/79_var_name.out
#	ctest/functional/80_chaos_token.out
#	ctest/functional/81_skip_spaces.out
#	ctest/functional/83_long_array.out
#	ctest/functional/84_long_array2.out
#	ctest/functional/85_long_code.out
#	ctest/functional/87_many_params.out
#	ctest/functional/88_many_params2.out
#	ctest/functional/89_many_globals.out
#	ctest/functional/90_many_locals.out
#	ctest/functional/91_many_locals2.in
#	ctest/functional/91_many_locals2.out
#	ctest/functional/92_register_alloc.out
#	ctest/functional/93_nested_calls.out
#	ctest/functional/94_nested_loops.out
#	ctest/functional/96_matrix_add.out
#	ctest/functional/97_matrix_sub.out
#	ctest/functional/98_matrix_mul.out
#	ctest/functional/99_matrix_tran.out
#	ctest/hidden_functional/01_multiple_returns.out
#	ctest/hidden_functional/03_branch.out
#	ctest/hidden_functional/05_param_name.out
#	ctest/hidden_functional/07_arr_init_nd.out
#	ctest/hidden_functional/14_dp.out
#	ctest/hidden_functional/15_graph_coloring.out
#	ctest/hidden_functional/18_prim.out
#	example
#	example.sy
#	exampleO0.s
#	include/Instruction.h
#	include/MachineCode.h
#	include/mem2reg.h
#	src/Ast.cpp
#	src/Instruction.cpp
#	src/main.cpp
#	src/mem2reg.cpp

图着色&CSE

See merge request 2013216/2023_compiler_reset!9

mem2reg#1

See merge request 2013216/2023_compiler_reset!5

# Conflicts:
#   include/BasicBlock.h
#   include/mem2reg.h
#   src/MachineCode.cpp
#   src/mem2reg.cpp

float fix3

See merge request 2013216/2023_compiler_reset!4

float fix

See merge request 2013216/2023_compiler_reset!3