From 013bcf28da22fd569154bd9f98368e670fbeb873 Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Thu, 25 Jan 2024 17:47:40 -0800
Subject: Fixes for `module` and `include`. (#3519)

* Fix type checking of enum cases.

* Allow decl to have same name as module.

---------

Co-authored-by: Yong He <yhe@nvidia.com>
---
 source/slang/slang-check-decl.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'source/slang/slang-check-decl.cpp')

diff --git a/source/slang/slang-check-decl.cpp b/source/slang/slang-check-decl.cpp
index 0df9619b6..fe4a7d64c 100644
--- a/source/slang/slang-check-decl.cpp
+++ b/source/slang/slang-check-decl.cpp
@@ -528,6 +528,7 @@ namespace Slang
         }
         else if( auto enumCaseDeclRef = declRef.as<EnumCaseDecl>() )
         {
+            sema->ensureDecl(declRef.declRefBase, DeclCheckState::Checked);
             QualType qualType;
             qualType.type = getType(astBuilder, enumCaseDeclRef);
             qualType.isLeftValue = false;
@@ -5117,6 +5118,8 @@ namespace Slang
         // TODO: Do we need/want to support generic cases some day?
         auto parentEnumDecl = as<EnumDecl>(decl->parentDecl);
         SLANG_ASSERT(parentEnumDecl);
+        
+        decl->type.type = DeclRefType::create(m_astBuilder, makeDeclRef(parentEnumDecl));
 
         // The tag type should have already been set by
         // the surrounding `enum` declaration.
@@ -5852,6 +5855,13 @@ namespace Slang
             }
         }
 
+        if (as<ModuleDeclarationDecl>(oldDecl) || as<ModuleDeclarationDecl>(newDecl))
+        {
+            // It is allowed to have a decl whose name is the same as the module.
+            return SLANG_OK;
+        }
+
+
         // For all other flavors of declaration, we do not
         // allow duplicate declarations with the same name.
         //
-- 
cgit v1.2.3