ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make atomic compare related intrinsics optional ok

Browse Source
This commit is contained in:
gingerBill
2021-04-27 16:55:39 +01:00
parent f6d98d2a16
commit 24f2d97c0e
2 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_builtin.cpp
+4 -4
View File
@@ -2017,8 +2017,8 @@ bool check_builtin_procedure(CheckerContext *c, Operand *operand, Ast *call, i32
} }
} }
operand->mode = Addressing_Value; operand->mode = Addressing_OptionalOk;
operand->type = make_optional_ok_type(default_type(x.type), false); // Just reusing this procedure, it's not optional operand->type = default_type(x.type);
} }
break; break;
@@ -2149,8 +2149,8 @@ bool check_builtin_procedure(CheckerContext *c, Operand *operand, Ast *call, i32
check_assignment(c, &x, elem, builtin_name); check_assignment(c, &x, elem, builtin_name);
check_assignment(c, &y, elem, builtin_name); check_assignment(c, &y, elem, builtin_name);
operand->mode = Addressing_Value; operand->mode = Addressing_OptionalOk;
operand->type = make_optional_ok_type(elem, /*typed*/false); operand->type = elem;
break; break;
} }
break; break;
src/llvm_backend.cpp
+30 -18
View File
@@ -9136,9 +9136,11 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv,
case BuiltinProc_overflow_sub: case BuiltinProc_overflow_sub:
case BuiltinProc_overflow_mul: case BuiltinProc_overflow_mul:
{ {
Type *tuple = tv.type; Type *main_type = tv.type;
GB_ASSERT(is_type_tuple(tuple)); Type *type = main_type;
Type *type = tuple->Tuple.variables[0]->type; if (is_type_tuple(main_type)) {
type = main_type->Tuple.variables[0]->type;
}
lbValue x = lb_build_expr(p, ce->args[0]); lbValue x = lb_build_expr(p, ce->args[0]);
lbValue y = lb_build_expr(p, ce->args[1]); lbValue y = lb_build_expr(p, ce->args[1]);
@@ -9168,18 +9170,22 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv,
args[0] = x.value; args[0] = x.value;
args[1] = y.value; args[1] = y.value;
Type *res_type = nullptr; lbValue res = {};
{ res.value = LLVMBuildCall(p->builder, ip, args, gb_count_of(args), "");
if (is_type_tuple(main_type)) {
Type *res_type = nullptr;
gbAllocator a = permanent_allocator(); gbAllocator a = permanent_allocator();
res_type = alloc_type_tuple(); res_type = alloc_type_tuple();
array_init(&res_type->Tuple.variables, a, 2); array_init(&res_type->Tuple.variables, a, 2);
res_type->Tuple.variables[0] = alloc_entity_field(nullptr, blank_token, type, false, 0); res_type->Tuple.variables[0] = alloc_entity_field(nullptr, blank_token, type, false, 0);
res_type->Tuple.variables[1] = alloc_entity_field(nullptr, blank_token, t_llvm_bool, false, 1); res_type->Tuple.variables[1] = alloc_entity_field(nullptr, blank_token, t_llvm_bool, false, 1);
}
lbValue res = {}; res.type = res_type;
res.value = LLVMBuildCall(p->builder, ip, args, gb_count_of(args), ""); } else {
res.type = res_type; res.value = LLVMBuildExtractValue(p->builder, res.value, 0, "");
res.type = type;
}
return res; return res;
} }
@@ -9392,16 +9398,22 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv,
single_threaded single_threaded
); );
GB_ASSERT(tv.type->kind == Type_Tuple); if (tv.type->kind == Type_Tuple) {
Type *fix_typed = alloc_type_tuple(); Type *fix_typed = alloc_type_tuple();
array_init(&fix_typed->Tuple.variables, permanent_allocator(), 2); array_init(&fix_typed->Tuple.variables, permanent_allocator(), 2);
fix_typed->Tuple.variables[0] = tv.type->Tuple.variables[0]; fix_typed->Tuple.variables[0] = tv.type->Tuple.variables[0];
fix_typed->Tuple.variables[1] = alloc_entity_field(nullptr, blank_token, t_llvm_bool, false, 1); fix_typed->Tuple.variables[1] = alloc_entity_field(nullptr, blank_token, t_llvm_bool, false, 1);
lbValue res = {}; lbValue res = {};
res.value = value; res.value = value;
res.type = fix_typed; res.type = fix_typed;
return res; return res;
} else {
lbValue res = {};
res.value = LLVMBuildExtractValue(p->builder, value, 0, "");
res.type = tv.type;
return res;
}
} }