fixing merge issues

Author: Joao Saffran

llvm/lib/Frontend/HLSL/RootSignatureMetadata.cpp

@@ -555,10 +555,13 @@ Error MetadataParser::validateRootSignature(
 
     dxbc::RootParameterType PT =
         static_cast<dxbc::RootParameterType>(Info.Header.ParameterType);
-
-    case to_underlying(dxbc::RootParameterType::CBV):
-    case to_underlying(dxbc::RootParameterType::UAV):
-    case to_underlying(dxbc::RootParameterType::SRV): {
+    switch (PT) {
+    case dxbc::RootParameterType::Constants32Bit:
+      // ToDo: Add proper validation.
+      continue;
+    case dxbc::RootParameterType::CBV:
+    case dxbc::RootParameterType::UAV:
+    case dxbc::RootParameterType::SRV: {
       const dxbc::RTS0::v2::RootDescriptor &Descriptor =
           RSD.ParametersContainer.getRootDescriptor(Info.Location);
       if (!hlsl::rootsig::verifyRegisterValue(Descriptor.ShaderRegister))