GitLab

# Conflicts:
#	Cargo.toml
#	build.rs
#	src/ast/src/inst.rs
#	src/ast/src/ir.rs
#	src/ast/src/ir_semantics.rs
#	src/ast/src/op.rs
#	src/compiler/backend/arch/aarch64/inst_sel.rs
#	src/compiler/backend/arch/x86_64/asm_backend.rs
#	src/compiler/backend/arch/x86_64/inst_sel.rs
#	src/compiler/backend/arch/x86_64/mod.rs
#	src/compiler/backend/mod.rs
#	src/lib.rs
#	src/runtime/entrypoints.rs
#	src/runtime/mod.rs
#	src/runtime/thread.rs
#	src/testutil/aot.rs
#	src/testutil/mod.rs
#	src/vm/vm.rs
#	tests/ir_macros.rs
#	tests/test_compiler/test_alloc.rs
#	tests/test_compiler/test_binop.rs
#	tests/test_compiler/test_call.rs
#	tests/test_compiler/test_controlflow.rs
#	tests/test_compiler/test_convop.rs
#	tests/test_compiler/test_exception.rs
#	tests/test_compiler/test_floatingpoint.rs
#	tests/test_compiler/test_inline.rs
#	tests/test_compiler/test_int.rs
#	tests/test_compiler/test_int128.rs
#	tests/test_compiler/test_mem_inst.rs
#	tests/test_compiler/test_regalloc.rs
#	tests/test_compiler/test_thread.rs