changing back enums to enum class

Author: joaosaffran

llvm/include/llvm/BinaryFormat/DXContainer.h

@@ -159,7 +159,7 @@ enum class RootElementFlag : uint32_t {
 };
 
 #define ROOT_PARAMETER(Val, Enum) Enum = Val,
-enum RootParameterType : uint32_t {
+enum class RootParameterType : uint32_t {
 #include "DXContainerConstants.def"
 };
 
@@ -176,7 +176,7 @@ inline bool isValidParameterType(uint32_t V) {
 }
 
 #define SHADER_VISIBILITY(Val, Enum) Enum = Val,
-enum ShaderVisibility : uint32_t {
+enum class ShaderVisibility : uint32_t {
 #include "DXContainerConstants.def"
 };
 

llvm/include/llvm/Object/DXContainer.h

@@ -139,7 +139,8 @@ struct RootParameterView {
 
 struct RootConstantView : RootParameterView {
   static bool classof(const RootParameterView *V) {
-    return V->Header.ParameterType == dxbc::RootParameterType::Constants32Bit;
+    return V->Header.ParameterType ==
+           (uint32_t)dxbc::RootParameterType::Constants32Bit;
   }
 
   llvm::Expected<dxbc::RootConstants> read() {
@@ -183,7 +184,10 @@ class RootSignature {
   getParameter(const dxbc::RootParameterHeader &Header) const {
     size_t DataSize;
 
-    switch (Header.ParameterType) {
+    if (!dxbc::isValidParameterType(Header.ParameterType))
+      return parseFailed("invalid parameter type");
+
+    switch (static_cast<dxbc::RootParameterType>(Header.ParameterType)) {
     case dxbc::RootParameterType::Constants32Bit:
       DataSize = sizeof(dxbc::RootConstants);
       break;

llvm/lib/MC/DXContainerRootSignature.cpp

@@ -34,7 +34,7 @@ size_t RootSignatureDesc::getSize() const {
 
   for (const auto &P : Parameters) {
     switch (P.Header.ParameterType) {
-    case dxbc::RootParameterType::Constants32Bit:
+    case static_cast<uint32_t>(dxbc::RootParameterType::Constants32Bit):
       Size += sizeof(dxbc::RootConstants);
       break;
     }
@@ -75,7 +75,7 @@ void RootSignatureDesc::write(raw_ostream &OS) const {
     const auto &P = Parameters[I];
 
     switch (P.Header.ParameterType) {
-    case dxbc::RootParameterType::Constants32Bit:
+    case static_cast<uint32_t>(dxbc::RootParameterType::Constants32Bit):
       support::endian::write(BOS, P.Constants.ShaderRegister,
                              llvm::endianness::little);
       support::endian::write(BOS, P.Constants.RegisterSpace,

llvm/lib/ObjectYAML/DXContainerEmitter.cpp

@@ -19,6 +19,7 @@
 #include "llvm/Support/Errc.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/raw_ostream.h"
+#include <cstdint>
 
 using namespace llvm;
 
@@ -276,7 +277,7 @@ void DXContainerWriter::writeParts(raw_ostream &OS) {
 
         switch (Param.Type) {
 
-        case dxbc::RootParameterType::Constants32Bit:
+        case static_cast<uint32_t>(dxbc::RootParameterType::Constants32Bit):
           NewParam.Constants.Num32BitValues = Param.Constants.Num32BitValues;
           NewParam.Constants.RegisterSpace = Param.Constants.RegisterSpace;
           NewParam.Constants.ShaderRegister = Param.Constants.ShaderRegister;

llvm/lib/ObjectYAML/DXContainerYAML.cpp

@@ -16,6 +16,7 @@
 #include "llvm/BinaryFormat/DXContainer.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/ScopedPrinter.h"
+#include <cstdint>
 #include <system_error>
 
 namespace llvm {
@@ -279,8 +280,9 @@ void MappingTraits<llvm::DXContainerYAML::RootParameterYamlDesc>::mapping(
     IO &IO, llvm::DXContainerYAML::RootParameterYamlDesc &P) {
   IO.mapRequired("ParameterType", P.Type);
   IO.mapRequired("ShaderVisibility", P.Visibility);
+
   switch (P.Type) {
-  case dxbc::RootParameterType::Constants32Bit:
+  case static_cast<uint32_t>(dxbc::RootParameterType::Constants32Bit):
     IO.mapRequired("Constants", P.Constants);
     break;
   }