From 7f89f6b582b138f9809d80f7ed133d72c248f56d Mon Sep 17 00:00:00 2001 From: gingerBill Date: Fri, 17 Jan 2020 23:30:38 +0000 Subject: [PATCH] Add intrinsics.type_is_specialization_of --- core/intrinsics/intrinsics.odin | 2 ++ src/check_expr.cpp | 30 ++++++++++++++++++++++++++++++ src/checker_builtin_procs.hpp | 4 ++++ src/ir.cpp | 2 +- 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/core/intrinsics/intrinsics.odin b/core/intrinsics/intrinsics.odin index ab6535645..06b0908b0 100644 --- a/core/intrinsics/intrinsics.odin +++ b/core/intrinsics/intrinsics.odin @@ -124,6 +124,8 @@ type_is_bit_field_value :: proc($T: typeid) -> bool --- type_is_bit_set :: proc($T: typeid) -> bool --- type_is_simd_vector :: proc($T: typeid) -> bool --- +type_is_specialization_of :: proc($T, $S: typeid) -> bool --- + type_has_nil :: proc($T: typeid) -> bool --- type_proc_parameter_count :: proc($T: typeid) -> int where type_is_proc(T) --- diff --git a/src/check_expr.cpp b/src/check_expr.cpp index 4f1aed898..c8778a222 100644 --- a/src/check_expr.cpp +++ b/src/check_expr.cpp @@ -5499,6 +5499,36 @@ bool check_builtin_procedure(CheckerContext *c, Operand *operand, Ast *call, i32 operand->type = t_untyped_bool; break; + case BuiltinProc_type_is_specialization_of: + { + if (operand->mode != Addressing_Type) { + error(operand->expr, "Expected a type for '%.*s'", LIT(builtin_name)); + operand->mode = Addressing_Invalid; + operand->type = t_invalid; + return false; + } + Type *t = operand->type; + Type *s = nullptr; + + bool prev_ips = c->in_polymorphic_specialization; + c->in_polymorphic_specialization = true; + s = check_type(c, ce->args[1]); + c->in_polymorphic_specialization = prev_ips; + + if (s == t_invalid) { + error(ce->args[1], "Invalid specialization type for '%.*s'", LIT(builtin_name)); + operand->mode = Addressing_Invalid; + operand->type = t_invalid; + return false; + } + + operand->mode = Addressing_Constant; + operand->type = t_untyped_bool; + operand->value = exact_value_bool(check_type_specialization_to(c, s, t, false, false)); + + } + break; + case BuiltinProc_type_proc_parameter_count: operand->value = exact_value_i64(0); if (operand->mode != Addressing_Type) { diff --git a/src/checker_builtin_procs.hpp b/src/checker_builtin_procs.hpp index ffdaf43d7..add087afe 100644 --- a/src/checker_builtin_procs.hpp +++ b/src/checker_builtin_procs.hpp @@ -155,6 +155,8 @@ BuiltinProc__type_begin, BuiltinProc_type_is_bit_set, BuiltinProc_type_is_simd_vector, + BuiltinProc_type_is_specialization_of, + BuiltinProc_type_has_nil, BuiltinProc_type_proc_parameter_count, @@ -319,6 +321,8 @@ gb_global BuiltinProc builtin_procs[BuiltinProc_COUNT] = { {STR_LIT("type_is_bit_set"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("type_is_simd_vector"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, + {STR_LIT("type_is_specialization_of"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, + {STR_LIT("type_has_nil"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("type_proc_parameter_count"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, diff --git a/src/ir.cpp b/src/ir.cpp index b23c81e78..5d075d7dd 100644 --- a/src/ir.cpp +++ b/src/ir.cpp @@ -3172,7 +3172,7 @@ irValue *ir_emit_call(irProcedure *p, irValue *value, Array const &ar } else if (!is_type_pointer(arg_type)) { array_add(&processed_args, ir_copy_value_to_ptr(p, args[i], original_type, 16)); } - } else if (is_type_integer(new_type)) { + } else if (is_type_integer(new_type) || is_type_float(new_type)) { array_add(&processed_args, ir_emit_transmute(p, args[i], new_type)); } else if (new_type == t_llvm_bool) { array_add(&processed_args, ir_emit_conv(p, args[i], new_type));