fix

Author: joaosaffran

llvm/include/llvm/MC/DXContainerRootSignature.h

@@ -29,8 +29,8 @@ struct RootParameterInfo {
       : Header(H), Location(L) {}
 };
 
-using RootDescriptor = std::variant<dxbc::RST0::v0::RootDescriptor *,
-                                    dxbc::RST0::v1::RootDescriptor *>;
+using RootDescriptor = std::variant<dxbc::RST0::v0::RootDescriptor,
+                                    dxbc::RST0::v1::RootDescriptor>;
 using ParametersView = std::variant<const dxbc::RootConstants *,
                                     const dxbc::RST0::v0::RootDescriptor *,
                                     const dxbc::RST0::v1::RootDescriptor *>;
@@ -52,13 +52,13 @@ struct RootParametersContainer {
   void addParameter(dxbc::RootParameterHeader H,
                     dxbc::RST0::v0::RootDescriptor D) {
     addInfo(H, Descriptors.size());
-    Descriptors.push_back(std::move(&D));
+    Descriptors.push_back(D);
   }
 
   void addParameter(dxbc::RootParameterHeader H,
                     dxbc::RST0::v1::RootDescriptor D) {
     addInfo(H, Descriptors.size());
-    Descriptors.push_back(std::move(&D));
+    Descriptors.push_back(D);
   }
 
   std::optional<ParametersView> getParameter(const RootParameterInfo *H) const {
@@ -68,11 +68,12 @@ struct RootParametersContainer {
     case llvm::to_underlying(dxbc::RootParameterType::CBV):
     case llvm::to_underlying(dxbc::RootParameterType::SRV):
     case llvm::to_underlying(dxbc::RootParameterType::UAV):
-      RootDescriptor VersionedParam = Descriptors[H->Location];
-      if (std::holds_alternative<dxbc::RST0::v0::RootDescriptor *>(
-              VersionedParam))
-        return std::get<dxbc::RST0::v0::RootDescriptor *>(VersionedParam);
-      return std::get<dxbc::RST0::v1::RootDescriptor *>(VersionedParam);
+      const RootDescriptor &VersionedParam = Descriptors[H->Location];
+      if (std::holds_alternative<dxbc::RST0::v0::RootDescriptor>(
+              VersionedParam)) {
+        return &std::get<dxbc::RST0::v0::RootDescriptor>(VersionedParam);
+      }
+      return &std::get<dxbc::RST0::v1::RootDescriptor>(VersionedParam);
     }
 
     return std::nullopt;

llvm/lib/MC/DXContainerRootSignature.cpp

@@ -80,8 +80,8 @@ void RootSignatureDesc::write(raw_ostream &OS) const {
     auto P = ParametersContainer.getParameter(H);
     if (!P)
       continue;
-    if (std::holds_alternative<const dxbc::RootConstants *>(*P)) {
-      auto *Constants = std::get<const dxbc::RootConstants *>(*P);
+    if (std::holds_alternative<const dxbc::RootConstants *>(P.value())) {
+      auto *Constants = std::get<const dxbc::RootConstants *>(P.value());
       support::endian::write(BOS, Constants->ShaderRegister,
                              llvm::endianness::little);
       support::endian::write(BOS, Constants->RegisterSpace,
@@ -90,14 +90,16 @@ void RootSignatureDesc::write(raw_ostream &OS) const {
                              llvm::endianness::little);
     } else if (std::holds_alternative<const dxbc::RST0::v0::RootDescriptor *>(
                    *P)) {
-      auto *Descriptor = std::get<const dxbc::RST0::v0::RootDescriptor *>(*P);
+      auto *Descriptor =
+          std::get<const dxbc::RST0::v0::RootDescriptor *>(P.value());
       support::endian::write(BOS, Descriptor->ShaderRegister,
                              llvm::endianness::little);
       support::endian::write(BOS, Descriptor->RegisterSpace,
                              llvm::endianness::little);
     } else if (std::holds_alternative<const dxbc::RST0::v1::RootDescriptor *>(
                    *P)) {
-      auto *Descriptor = std::get<const dxbc::RST0::v1::RootDescriptor *>(*P);
+      auto *Descriptor =
+          std::get<const dxbc::RST0::v1::RootDescriptor *>(P.value());
 
       support::endian::write(BOS, Descriptor->ShaderRegister,
                              llvm::endianness::little);

llvm/lib/ObjectYAML/DXContainerEmitter.cpp

@@ -299,13 +299,13 @@ void DXContainerWriter::writeParts(raw_ostream &OS) {
             Descriptor.ShaderRegister = Param.Descriptor.ShaderRegister;
             Descriptor.Flags = Param.Descriptor.getEncodedFlags();
           RS.ParametersContainer.addParameter(Header, Descriptor);
+          }
           break;
         default:
           // Handling invalid parameter type edge case
           RS.ParametersContainer.addInfo(Header, -1);
         }
       }
-    }
 
       RS.write(OS);
       break;