From f8a5602c55606f8e97f5576c85cbc2a58026a999 Mon Sep 17 00:00:00 2001
From: johnkslang <john@johnkgo.com>
Date: Mon, 14 Sep 2020 02:49:38 -0600
Subject: [PATCH] Fix #2385: guard against constant_id on non-const.

---
 glslang/HLSL/hlslParseHelper.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/glslang/HLSL/hlslParseHelper.cpp b/glslang/HLSL/hlslParseHelper.cpp
index ca0d2071..3150eacf 100755
--- a/glslang/HLSL/hlslParseHelper.cpp
+++ b/glslang/HLSL/hlslParseHelper.cpp
@@ -1953,6 +1953,10 @@ void HlslParseContext::transferTypeAttributes(const TSourceLoc& loc, const TAttr
             break;
         case EatConstantId:
             // specialization constant
+            if (type.getQualifier().storage != EvqConst) {
+                error(loc, "needs a const type", "constant_id", "");
+                break;
+            }
             if (it->getInt(value)) {
                 TSourceLoc loc;
                 loc.init();