clean up

Author: joaosaffran

llvm/include/llvm/Object/DXContainer.h

@@ -124,25 +124,25 @@ template <typename T> struct ViewArray {
 
 namespace DirectX {
 
-template <typename T> Expected<T> readParameter(StringRef Data) {
-  T Struct;
-  if (sizeof(T) != Data.size())
-    return make_error<GenericBinaryError>(
-        "Reading structure out of file bounds", object_error::parse_failed);
-
-  memcpy(&Struct, Data.data(), sizeof(T));
-  // DXContainer is always little endian
-  if (sys::IsBigEndianHost)
-    Struct.swapBytes();
-  return Struct;
-}
-
 struct RootParameterView {
   const dxbc::RTS0::v1::RootParameterHeader &Header;
   StringRef ParamData;
 
   RootParameterView(const dxbc::RTS0::v1::RootParameterHeader &H, StringRef P)
       : Header(H), ParamData(P) {}
+
+  template <typename T> Expected<T> readParameter() {
+    T Struct;
+    if (sizeof(T) != ParamData.size())
+      return make_error<GenericBinaryError>(
+          "Reading structure out of file bounds", object_error::parse_failed);
+
+    memcpy(&Struct, ParamData.data(), sizeof(T));
+    // DXContainer is always little endian
+    if (sys::IsBigEndianHost)
+      Struct.swapBytes();
+    return Struct;
+  }
 };
 
 struct RootConstantView : RootParameterView {
@@ -152,7 +152,7 @@ struct RootConstantView : RootParameterView {
   }
 
   llvm::Expected<dxbc::RTS0::v1::RootConstants> read() {
-    return readParameter<dxbc::RTS0::v1::RootConstants>(ParamData);
+    return readParameter<dxbc::RTS0::v1::RootConstants>();
   }
 };
 
@@ -168,8 +168,7 @@ struct RootDescriptorView : RootParameterView {
 
   llvm::Expected<dxbc::RTS0::v2::RootDescriptor> read(uint32_t Version) {
     if (Version == 1) {
-      auto Descriptor =
-          readParameter<dxbc::RTS0::v1::RootDescriptor>(ParamData);
+      auto Descriptor = readParameter<dxbc::RTS0::v1::RootDescriptor>();
       if (Error E = Descriptor.takeError())
         return E;
       return dxbc::RTS0::v2::RootDescriptor(*Descriptor);
@@ -178,7 +177,7 @@ struct RootDescriptorView : RootParameterView {
       return make_error<GenericBinaryError>("Invalid Root Signature version: " +
                                                 Twine(Version),
                                             object_error::parse_failed);
-    return readParameter<dxbc::RTS0::v2::RootDescriptor>(ParamData);
+    return readParameter<dxbc::RTS0::v2::RootDescriptor>();
   }
 };
 

llvm/lib/Object/DXContainer.cpp

@@ -6,8 +6,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <cstddef>
-
 #include "llvm/Object/DXContainer.h"
 #include "llvm/BinaryFormat/DXContainer.h"
 #include "llvm/Object/Error.h"

llvm/lib/ObjectYAML/DXContainerYAML.cpp

@@ -164,7 +164,6 @@ DXContainerYAML::RootSignatureYamlDesc::create(
   }
 
   for (const auto &S : Data.samplers()) {
-
     if (!dxbc::isValidSamplerFilter(S.Filter))
       return createStringError(std::errc::invalid_argument,
                                "Invalid value for static sampler filter");

llvm/unittests/Object/DXContainerTest.cpp

@@ -1172,7 +1172,7 @@ TEST(RootSignature, ParseStaticSamplers) {
         0x00, 0x00, 0x00, 0x00, 0x85, 0xeb, 0x91, 0x40, 0x66, 0x66, 0x0e, 0x41,
         0x1f, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00};
     DXContainer C =
-        llvm::cantFail(DXContainer::create(getMemoryBuffer<144>(Buffer)));
+        llvm::cantFail(DXContainer::create(getMemoryBuffer<133>(Buffer)));
 
     auto MaybeRS = C.getRootSignature();
     ASSERT_TRUE(MaybeRS.has_value());