fix rebase issues

Author: joaosaffran

llvm/lib/ObjectYAML/DXContainerEmitter.cpp

@@ -290,9 +290,7 @@ void DXContainerWriter::writeParts(raw_ostream &OS) {
         RS.Parameters.push_back(NewParam);
       }
 
-      if (Error Err = RS.write(OS))
-        handleAllErrors(std::move(Err));
-
+      RS.write(OS);
       break;
     }
     uint64_t BytesWritten = OS.tell() - DataStart;

llvm/lib/Target/DirectX/DXContainerGlobals.cpp

@@ -175,8 +175,7 @@ void DXContainerGlobals::addRootSignature(Module &M,
   SmallString<256> Data;
   raw_svector_ostream OS(Data);
 
-  if (Error Err = RS.write(OS))
-    handleAllErrors(std::move(Err));
+  RS.write(OS);
 
   Constant *Constant =
       ConstantDataArray::getString(M.getContext(), Data, /*AddNull*/ false);

llvm/lib/Target/DirectX/DXILRootSignature.cpp

@@ -34,12 +34,12 @@ static bool parseRootConstants(LLVMContext *Ctx, mcdxbc::RootSignatureDesc &RSD,
   if (RootConstNode->getNumOperands() != 5)
     return reportError(Ctx, "Invalid format for Root constants element");
 
-  dxbc::RootParameter NewParam;
-  NewParam.ParameterType = dxbc::RootParameterType::Constants32Bit;
+  mcdxbc::RootParameter NewParam;
+  NewParam.Header.ParameterType = dxbc::RootParameterType::Constants32Bit;
 
   auto *ShaderVisibility =
       mdconst::extract<ConstantInt>(RootConstNode->getOperand(1));
-  NewParam.ShaderVisibility =
+  NewParam.Header.ShaderVisibility =
       (dxbc::ShaderVisibility)ShaderVisibility->getZExtValue();
 
   auto *ShaderRegister =
@@ -122,15 +122,15 @@ static bool validate(LLVMContext *Ctx, const mcdxbc::RootSignatureDesc &RSD) {
 
   for (const auto &P : RSD.Parameters) {
     // Parameter Type cannot be set through metadata.
-    assert(
-        dxbc::RootSignatureValidations::isValidParameterType(P.ParameterType));
+    assert(dxbc::RootSignatureValidations::isValidParameterType(
+        P.Header.ParameterType));
 
     if (!dxbc::RootSignatureValidations::isValidShaderVisibility(
-            P.ShaderVisibility)) {
+            P.Header.ShaderVisibility)) {
       return reportError(
           Ctx,
           "Invalid Root Signature parameter shader visibility in metadata " +
-              Twine((uint32_t)P.ShaderVisibility));
+              Twine((uint32_t)P.Header.ShaderVisibility));
     }
   }
   return false;
@@ -250,12 +250,14 @@ PreservedAnalyses RootSignatureAnalysisPrinter::run(Module &M,
     OS << indent(Space) << "- Parameters: \n";
     Space++;
     for (const auto &P : RS.Parameters) {
-      OS << indent(Space) << "Type: " << (uint32_t)P.ParameterType << " \n";
+      OS << indent(Space) << "Type: " << (uint32_t)P.Header.ParameterType
+         << " \n";
       OS << indent(Space)
-         << "ShaderVisibility: " << (uint32_t)P.ShaderVisibility << " \n";
+         << "ShaderVisibility: " << (uint32_t)P.Header.ShaderVisibility
+         << " \n";
       Space++;
 
-      switch (P.ParameterType) {
+      switch (P.Header.ParameterType) {
 
       case dxbc::RootParameterType::Constants32Bit: {
         OS << indent(Space) << "- Constants: \n";

llvm/test/CodeGen/DirectX/ContainerData/RootSignature-Constants.ll

@@ -23,9 +23,9 @@ attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
 ; DXC-NEXT:  Flags: 0x000000:
 ; DXC-NEXT:  Version: 2:
 ; DXC-NEXT:  NumParameters: 1:
-; DXC-NEXT:  RootParametersOffset: 20:
+; DXC-NEXT:  RootParametersOffset: 24:
 ; DXC-NEXT:  NumStaticSamplers: 0:
-; DXC-NEXT:  StaticSamplersOffset: 28:
+; DXC-NEXT:  StaticSamplersOffset: 48:
 ; DXC-NEXT:  - Parameters: 
 ; DXC-NEXT:   Type: 1 
 ; DXC-NEXT:   ShaderVisibility: 0