addressing comments and clean up

Author: joaosaffran

llvm/include/llvm/BinaryFormat/DXContainer.h

@@ -17,7 +17,6 @@
 #include "llvm/Support/SwapByteOrder.h"
 #include "llvm/TargetParser/Triple.h"
 
-#include <cstdint>
 #include <stdint.h>
 
 namespace llvm {

llvm/include/llvm/MC/DXContainerRootSignature.h

@@ -7,8 +7,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/BinaryFormat/DXContainer.h"
-#include <cstddef>
 #include <cstdint>
+#include <limits>
 
 namespace llvm {
 

llvm/include/llvm/Object/DXContainer.h

@@ -116,6 +116,7 @@ template <typename T> struct ViewArray {
 };
 
 namespace DirectX {
+
 struct RootParameter {
   dxbc::RootParameterHeader Header;
   union {
@@ -144,9 +145,9 @@ class RootSignature {
   uint32_t getRootParametersOffset() const { return RootParametersOffset; }
   uint32_t getNumStaticSamplers() const { return NumStaticSamplers; }
   uint32_t getStaticSamplersOffset() const { return StaticSamplersOffset; }
-  ParamsIter beginParams() { return Parameters.begin(); }
-
-  ParamsIter endParams() { return Parameters.end(); }
+  llvm::iterator_range<const RootParameter *> getParameters() const {
+    return llvm::make_range(Parameters.begin(), Parameters.end());
+  }
   uint32_t getFlags() const { return Flags; }
 };
 

llvm/include/llvm/ObjectYAML/DXContainerYAML.h

@@ -19,7 +19,6 @@
 #include "llvm/BinaryFormat/DXContainer.h"
 #include "llvm/Object/DXContainer.h"
 #include "llvm/ObjectYAML/YAML.h"
-#include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/YAMLTraits.h"
 #include <array>
 #include <cstdint>
@@ -88,16 +87,17 @@ struct RootParameterYamlDesc {
   uint32_t Offset;
 
   RootParameterYamlDesc() = default;
-  RootParameterYamlDesc(object::DirectX::RootParameter *Parameter) {
-    Type = Parameter->Header.ParameterType;
-    Visibility = Parameter->Header.ShaderVisibility;
-    Offset = Parameter->Header.ParameterOffset;
-    switch (Parameter->Header.ParameterType) {
+  RootParameterYamlDesc(const object::DirectX::RootParameter &Parameter) {
+
+    Type = Parameter.Header.ParameterType;
+    Visibility = Parameter.Header.ShaderVisibility;
+    Offset = Parameter.Header.ParameterOffset;
+    switch (Parameter.Header.ParameterType) {
 
     case dxbc::RootParameterType::Constants32Bit: {
-      Constants.Num32BitValues = Parameter->Constants.Num32BitValues;
-      Constants.RegisterSpace = Parameter->Constants.RegisterSpace;
-      Constants.ShaderRegister = Parameter->Constants.ShaderRegister;
+      Constants.Num32BitValues = Parameter.Constants.Num32BitValues;
+      Constants.RegisterSpace = Parameter.Constants.RegisterSpace;
+      Constants.ShaderRegister = Parameter.Constants.ShaderRegister;
     } break;
     case dxbc::RootParameterType::Empty:
       llvm_unreachable("Invalid Root Parameter Type. It should be verified "
@@ -112,7 +112,7 @@ struct RootParameterYamlDesc {
 
 struct RootSignatureYamlDesc {
   RootSignatureYamlDesc() = default;
-  RootSignatureYamlDesc(object::DirectX::RootSignature Data);
+  RootSignatureYamlDesc(const object::DirectX::RootSignature &Data);
 
   uint32_t Version;
   uint32_t NumStaticSamplers;

llvm/lib/MC/DXContainerRootSignature.cpp

@@ -8,10 +8,8 @@
 
 #include "llvm/MC/DXContainerRootSignature.h"
 #include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/SmallVector.h"
 #include "llvm/BinaryFormat/DXContainer.h"
 #include "llvm/Support/EndianStream.h"
-#include <cstdint>
 
 using namespace llvm;
 using namespace llvm::mcdxbc;

llvm/lib/ObjectYAML/DXContainerEmitter.cpp

@@ -18,7 +18,6 @@
 #include "llvm/ObjectYAML/yaml2obj.h"
 #include "llvm/Support/Errc.h"
 #include "llvm/Support/Error.h"
-#include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace llvm;

llvm/lib/ObjectYAML/DXContainerYAML.cpp

@@ -14,7 +14,6 @@
 #include "llvm/ObjectYAML/DXContainerYAML.h"
 #include "llvm/ADT/ScopeExit.h"
 #include "llvm/BinaryFormat/DXContainer.h"
-#include "llvm/Object/DXContainer.h"
 #include "llvm/Support/ScopedPrinter.h"
 
 namespace llvm {
@@ -31,12 +30,12 @@ DXContainerYAML::ShaderFeatureFlags::ShaderFeatureFlags(uint64_t FlagData) {
 }
 
 DXContainerYAML::RootSignatureYamlDesc::RootSignatureYamlDesc(
-    object::DirectX::RootSignature Data)
+    const object::DirectX::RootSignature &Data)
     : Version(Data.getVersion()),
       NumStaticSamplers(Data.getNumStaticSamplers()),
       StaticSamplersOffset(Data.getStaticSamplersOffset()) {
   uint32_t Flags = Data.getFlags();
-  for (auto *P = Data.beginParams(); P != Data.endParams(); ++P) {
+  for (auto const &P : Data.getParameters()) {
 
     Parameters.push_back(RootParameterYamlDesc(P));
   }

llvm/unittests/Object/DXContainerTest.cpp

@@ -912,18 +912,19 @@ TEST(RootSignature, ParseRootConstant) {
     auto RS = C.getRootSignature();
     ASSERT_TRUE(RS.has_value());
     ASSERT_EQ(RS->getVersion(), 2u);
-    ASSERT_EQ(RS->getNumParameters(), 1);
+    ASSERT_EQ(RS->getNumParameters(), 1u);
     ASSERT_EQ(RS->getRootParametersOffset(), 24u);
     ASSERT_EQ(RS->getNumStaticSamplers(), 0u);
     ASSERT_EQ(RS->getStaticSamplersOffset(), 44u);
     ASSERT_EQ(RS->getFlags(), 17u);
 
-    object::DirectX::RootParameter *RootParam = RS->beginParams();
-    ASSERT_EQ((uint32_t)RootParam->Header.ParameterType, 1u);
-    ASSERT_EQ((uint32_t)RootParam->Header.ShaderVisibility, 2u);
-    ASSERT_EQ(RootParam->Constants.ShaderRegister, 15u);
-    ASSERT_EQ(RootParam->Constants.RegisterSpace, 14u);
-    ASSERT_EQ(RootParam->Constants.Num32BitValues, 16u);
+    for (auto const &RootParam : RS->getParameters()) {
+      ASSERT_EQ((uint32_t)RootParam.Header.ParameterType, 1u);
+      ASSERT_EQ((uint32_t)RootParam.Header.ShaderVisibility, 2u);
+      ASSERT_EQ(RootParam.Constants.ShaderRegister, 15u);
+      ASSERT_EQ(RootParam.Constants.RegisterSpace, 14u);
+      ASSERT_EQ(RootParam.Constants.Num32BitValues, 16u);
+    }
   }
   {
     // ParameterType has been set to an invalid value

llvm/unittests/ObjectYAML/DXContainerYAMLTest.cpp

@@ -134,8 +134,8 @@ TEST(RootSignature, ParseRootFlags) {
     )"));
 
   uint8_t Buffer[] = {
-      0x44, 0x58, 0x42, 0x43, 0x32, 0x9a, 0x53, 0xd8, 0xec, 0xbe, 0x35, 0x6f,
-      0x05, 0x39, 0xe1, 0xfe, 0x31, 0x20, 0xf0, 0xc1, 0x01, 0x00, 0x00, 0x00,
+      0x44, 0x58, 0x42, 0x43, 0x32, 0x9A, 0x53, 0xD8, 0xEC, 0xBE, 0x35, 0x6F,
+      0x05, 0x39, 0xE1, 0xFE, 0x31, 0x20, 0xF0, 0xC1, 0x01, 0x00, 0x00, 0x00,
       0x44, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00,
       0x52, 0x54, 0x53, 0x30, 0x18, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
       0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,