From 478c923e2cc6d4fc15ccf550b0c952495d8b81df Mon Sep 17 00:00:00 2001
From: Laytan Laats <laytanlaats@hotmail.com>
Date: Mon, 26 May 2025 19:48:28 +0200
Subject: [PATCH] fix another type alias issue with mini cycle

---
 src/check_type.cpp                  |  8 ++++++--
 tests/issues/run.bat                |  1 +
 tests/issues/run.sh                 |  1 +
 tests/issues/test_issue_5097-2.odin | 24 ++++++++++++++++++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 tests/issues/test_issue_5097-2.odin

diff --git a/src/check_type.cpp b/src/check_type.cpp
index 431698459..450b5e100 100644
--- a/src/check_type.cpp
+++ b/src/check_type.cpp
@@ -3805,7 +3805,11 @@ gb_internal Type *check_type_expr(CheckerContext *ctx, Ast *e, Type *named_type)
 		#if 0
 		error(e, "Invalid type definition of '%.*s'", LIT(type->Named.name));
 		#endif
-		type->Named.base = t_invalid;
+		if (type->Named.type_name->TypeName.is_type_alias) {
+			// NOTE(laytan): keep it null, type declaration is a mini "cycle" to be filled later.
+		} else {
+			type->Named.base = t_invalid;
+		}
 	}
 
 	if (is_type_polymorphic(type)) {
@@ -3823,7 +3827,7 @@ gb_internal Type *check_type_expr(CheckerContext *ctx, Ast *e, Type *named_type)
 	}
 	#endif
 
-	if (is_type_typed(type)) {
+	if (type->kind == Type_Named && type->Named.base == nullptr || is_type_typed(type)) {
 		add_type_and_value(ctx, e, Addressing_Type, type, empty_exact_value);
 	} else {
 		gbString name = type_to_string(type);
diff --git a/tests/issues/run.bat b/tests/issues/run.bat
index 267a2e030..db941b55a 100644
--- a/tests/issues/run.bat
+++ b/tests/issues/run.bat
@@ -19,6 +19,7 @@ set COMMON=-define:ODIN_TEST_FANCY=false -file -vet -strict-style
 ..\..\..\odin test ..\test_issue_4584.odin %COMMON%  || exit /b
 ..\..\..\odin build ..\test_issue_5043.odin %COMMON% || exit /b
 ..\..\..\odin build ..\test_issue_5097.odin %COMMON% || exit /b
+..\..\..\odin build ..\test_issue_5097-2.odin %COMMON% || exit /b
 
 @echo off
 
diff --git a/tests/issues/run.sh b/tests/issues/run.sh
index 5102ee307..db0864c3e 100755
--- a/tests/issues/run.sh
+++ b/tests/issues/run.sh
@@ -26,6 +26,7 @@ else
 fi
 $ODIN build ../test_issue_5043.odin $COMMON
 $ODIN build ../test_issue_5097.odin $COMMON
+$ODIN build ../test_issue_5097-2.odin $COMMON
 
 set +x
 
diff --git a/tests/issues/test_issue_5097-2.odin b/tests/issues/test_issue_5097-2.odin
new file mode 100644
index 000000000..1e4ad59c9
--- /dev/null
+++ b/tests/issues/test_issue_5097-2.odin
@@ -0,0 +1,24 @@
+// Tests another variation of, this should compile #5097 https://github.com/odin-lang/Odin/issues/5097
+package test_issues
+
+Face      :: ^FaceRec
+GlyphSlot :: ^GlyphSlotRec
+Size      :: ^SizeRec
+
+SizeRec :: struct {
+    face: Face,
+}
+
+GlyphSlotRec :: struct {
+    face: Face,
+}
+
+FaceRec :: struct {
+    glyph: GlyphSlot,
+    size:  Size,
+}
+
+main :: proc() {
+    face: Face
+	_ = face
+}