adding test and removing string switch

Author: joaosaffran

llvm/lib/Frontend/HLSL/RootSignatureMetadata.cpp

@@ -330,11 +330,17 @@ Error MetadataParser::parseDescriptorRange(mcdxbc::DescriptorTable &Table,
   if (!ElementText.has_value())
     return make_error<InvalidRSMetadataFormat>("Descriptor Range");
 
-  Range.RangeType = StringSwitch<dxbc::DescriptorRangeType>(*ElementText)
-                        .Case("CBV", dxbc::DescriptorRangeType::CBV)
-                        .Case("SRV", dxbc::DescriptorRangeType::SRV)
-                        .Case("UAV", dxbc::DescriptorRangeType::UAV)
-                        .Case("Sampler", dxbc::DescriptorRangeType::Sampler);
+  if (*ElementText == "CBV")
+    Range.RangeType = dxbc::DescriptorRangeType::CBV;
+  else if (*ElementText == "SRV")
+    Range.RangeType = dxbc::DescriptorRangeType::SRV;
+  else if (*ElementText == "UAV")
+    Range.RangeType = dxbc::DescriptorRangeType::UAV;
+  else if (*ElementText == "Sampler")
+    Range.RangeType = dxbc::DescriptorRangeType::Sampler;
+  else
+    return make_error<GenericRSMetadataError>("Invalid Descriptor Range type.",
+                                              RangeDescriptorNode);
 
   if (std::optional<uint32_t> Val = extractMdIntValue(RangeDescriptorNode, 1))
     Range.NumDescriptors = *Val;

llvm/test/CodeGen/DirectX/ContainerData/RootSignature-DescriptorTable-Invalid-RangeType.ll

@@ -0,0 +1,20 @@
+; RUN: not opt -passes='print<dxil-root-signature>' %s -S -o - 2>&1 | FileCheck %s
+
+target triple = "dxil-unknown-shadermodel6.0-compute"
+
+; CHECK: error: Invalid Descriptor Range type
+; CHECK-NOT: Root Signature Definitions
+
+define void @main() #0 {
+entry:
+  ret void
+}
+attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
+
+
+!dx.rootsignatures = !{!2} ; list of function/root signature pairs
+!2 = !{ ptr @main, !3, i32 2 } ; function, root signature
+!3 = !{ !5 } ; list of root signature elements
+!5 = !{ !"DescriptorTable", i32 0, !6, !7 }
+!6 = !{ !"Invalid", i32 1, i32 0, i32 -1, i32 -1, i32 4 }
+!7 = !{ !"UAV", i32 5, i32 1, i32 10, i32 5, i32 2 }