From 359066147c0abc4ca6ad2902cc3a817383d4bd28 Mon Sep 17 00:00:00 2001
From: Mukund Keshava <mkeshava@nvidia.com>
Date: Mon, 2 Jun 2025 12:14:23 +0530
Subject: move fix to CheckUsableType (#7264)

---
 source/slang/slang-check-decl.cpp | 11 +----------
 source/slang/slang-parser.cpp     |  1 +
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/source/slang/slang-check-decl.cpp b/source/slang/slang-check-decl.cpp
index 081ccbb0b..5aff41988 100644
--- a/source/slang/slang-check-decl.cpp
+++ b/source/slang/slang-check-decl.cpp
@@ -10428,16 +10428,7 @@ void SemanticsDeclHeaderVisitor::visitAbstractStorageDeclCommon(ContainerDecl* d
 
 void SemanticsDeclHeaderVisitor::visitSubscriptDecl(SubscriptDecl* decl)
 {
-    // __subscript needs to have a return type specified. Check if return type
-    // is missing (represented as IncompleteExpr) and return an error.
-    if (decl->returnType.exp && as<IncompleteExpr>(decl->returnType.exp))
-    {
-        getSink()->diagnose(decl, Diagnostics::subscriptMustHaveReturnType);
-    }
-    else if (decl->returnType.exp)
-    {
-        decl->returnType = CheckUsableType(decl->returnType, decl);
-    }
+    decl->returnType = CheckUsableType(decl->returnType, decl);
 
     visitAbstractStorageDeclCommon(decl);
 
diff --git a/source/slang/slang-parser.cpp b/source/slang/slang-parser.cpp
index 439959827..398aab517 100644
--- a/source/slang/slang-parser.cpp
+++ b/source/slang/slang-parser.cpp
@@ -4110,6 +4110,7 @@ static NodeBase* parseSubscriptDecl(Parser* parser, void* /*userData*/)
             }
             else
             {
+                parser->diagnose(decl->loc, Diagnostics::subscriptMustHaveReturnType);
                 decl->returnType.exp = parser->astBuilder->create<IncompleteExpr>();
             }
 
-- 
cgit v1.2.3