Merge pull request #1202 from BradLewis/fix/generic-struct-field-with-default-value

Fix crash when using a generic proc in a struct field with a default value

1 files changed, 9 insertions, 3 deletions

diff --git a/src/server/generics.odin b/src/server/generics.odin
index fc22942..db858cc 100644
--- a/src/server/generics.odin
+++ b/src/server/generics.odin
@@ -761,9 +761,15 @@ resolve_poly_struct :: proc(ast_context: ^AstContext, b: ^SymbolStructValueBuild
 					// need to be updated
 					if data.parent_proc.params != nil {
 						for &param in data.parent_proc.params.list {
-							if param_ident, ok := param.type.derived.(^ast.Ident); ok {
-								if param_ident.name == ident.name {
-									param.type = expr
+							type := param.type
+							if type == nil {
+								type = param.default_value
+							}
+							if type != nil {
+								if param_ident, ok := type.derived.(^ast.Ident); ok {
+									if param_ident.name == ident.name {
+										param.type = expr
+									}
 								}
 							}
 						}