From 25f1d0906d2b5a8276c3832783970a798c12cc6c Mon Sep 17 00:00:00 2001
From: Laytan Laats <laytanlaats@hotmail.com>
Date: Wed, 1 May 2024 22:12:37 +0200
Subject: compiler: improve target features support

---
 src/entity.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/entity.cpp')

diff --git a/src/entity.cpp b/src/entity.cpp
index a12e1d0a6..d76d5f441 100644
--- a/src/entity.cpp
+++ b/src/entity.cpp
@@ -252,10 +252,8 @@ struct Entity {
 			bool    is_foreign                 : 1;
 			bool    is_export                  : 1;
 			bool    generated_from_polymorphic : 1;
-			bool    target_feature_disabled    : 1;
 			bool    entry_point_only           : 1;
 			bool    has_instrumentation        : 1;
-			String  target_feature;
 		} Procedure;
 		struct {
 			Array<Entity *> entities;
@@ -502,4 +500,4 @@ gb_internal bool is_entity_local_variable(Entity *e) {
 
 	return ((e->scope->flags &~ ScopeFlag_ContextDefined) == 0) ||
 	       (e->scope->flags & ScopeFlag_Proc) != 0;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From d85c8f0b2c5989f7d14b02c9023060990d241111 Mon Sep 17 00:00:00 2001
From: gingerBill <bill@gingerbill.org>
Date: Thu, 9 May 2024 10:58:57 +0100
Subject: Fix #3555

---
 src/check_decl.cpp | 11 +++++++++++
 src/check_type.cpp |  1 +
 src/entity.cpp     |  1 +
 src/types.cpp      |  4 ++++
 4 files changed, 17 insertions(+)

(limited to 'src/entity.cpp')

diff --git a/src/check_decl.cpp b/src/check_decl.cpp
index 5b9486873..441c8000d 100644
--- a/src/check_decl.cpp
+++ b/src/check_decl.cpp
@@ -1619,6 +1619,17 @@ gb_internal bool check_proc_body(CheckerContext *ctx_, Token token, DeclInfo *de
 				if (e->kind != Entity_Variable) {
 					continue;
 				}
+				if (is_type_polymorphic(e->type)) {
+					gbString s = type_to_string(e->type);
+					char const *msg = "Unspecialized polymorphic types are not allowed in procedure parameters, got %s";
+					if (e->Variable.type_expr) {
+						error(e->Variable.type_expr, msg, s);
+					} else {
+						error(e->token, msg, s);
+					}
+					gb_string_free(s);
+				}
+
 				if (!(e->flags & EntityFlag_Using)) {
 					continue;
 				}
diff --git a/src/check_type.cpp b/src/check_type.cpp
index c119ce6b5..3d11b5012 100644
--- a/src/check_type.cpp
+++ b/src/check_type.cpp
@@ -2076,6 +2076,7 @@ gb_internal Type *check_get_params(CheckerContext *ctx, Scope *scope, Ast *_para
 					param = alloc_entity_param(scope, name->Ident.token, type, is_using, true);
 					param->Variable.param_value = param_value;
 					param->Variable.field_group_index = field_group_index;
+					param->Variable.type_expr = type_expr;
 				}
 			}
 			if (p->flags&FieldFlag_no_alias) {
diff --git a/src/entity.cpp b/src/entity.cpp
index d76d5f441..60ca208ec 100644
--- a/src/entity.cpp
+++ b/src/entity.cpp
@@ -210,6 +210,7 @@ struct Entity {
 			CommentGroup *comment;
 		} Constant;
 		struct {
+			Ast *type_expr; // only used for some variables within procedure bodies
 			Ast *init_expr; // only used for some variables within procedure bodies
 			i32  field_index;
 			i32  field_group_index;
diff --git a/src/types.cpp b/src/types.cpp
index 3ec05059f..30e009086 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -3267,6 +3267,10 @@ gb_internal Selection lookup_field_with_selection(Type *type_, String field_name
 			}
 		}
 
+		if (is_type_polymorphic(type)) {
+			// NOTE(bill): A polymorphic struct has no fields, this only hits in the case of an error
+			return sel;
+		}
 		wait_signal_until_available(&type->Struct.fields_wait_signal);
 		isize field_count = type->Struct.fields.count;
 		if (field_count != 0) for_array(i, type->Struct.fields) {
-- 
cgit v1.2.3