1 files changed, 9 insertions, 0 deletions
diff --git a/source/slang/slang-check-overload.cpp b/source/slang/slang-check-overload.cpp
index c6e6677b3..84c005f28 100644
--- a/source/slang/slang-check-overload.cpp
+++ b/source/slang/slang-check-overload.cpp
@@ -2113,6 +2113,15 @@ namespace Slang
     Expr* SemanticsExprVisitor::visitGenericAppExpr(GenericAppExpr* genericAppExpr)
     {
         // Start by checking the base expression and arguments.
+
+        // Disable the short-circuiting logic expression when the experssion is in
+        // the generic parameter.
+        if (this->m_shouldShortCircuitLogicExpr)
+        {
+            auto subContext = disableShortCircuitLogicalExpr();
+            return dispatchExpr(genericAppExpr, subContext);
+        }
+
         auto& baseExpr = genericAppExpr->functionExpr;
         baseExpr = CheckTerm(baseExpr);
         auto& args = genericAppExpr->arguments;