addressing comments and fix tests

Author: joaosaffran

llvm/include/llvm/BinaryFormat/DXContainer.h

@@ -550,12 +550,17 @@ static_assert(sizeof(ProgramSignatureElement) == 32,
 
 struct RootSignatureValidations {
 
-  static bool validateRootFlag(uint32_t Flags) {
-    return (Flags & ~0x80000fff) != 0;
+  static Expected<uint32_t> validateRootFlag(uint32_t Flags) {
+    if ((Flags & ~0x80000fff) != 0)
+      return llvm::make_error<BinaryStreamError>("Invalid Root Signature flag");
+    return Flags;
   }
 
-  static bool validateVersion(uint32_t Version) {
-    return (Version < 1 || Version > 2);
+  static Expected<uint32_t> validateVersion(uint32_t Version) {
+    if (Version < 1 || Version > 2)
+      return llvm::make_error<BinaryStreamError>(
+          "Invalid Root Signature Version");
+    return Version;
   }
 };
 

llvm/lib/Object/DXContainer.cpp

@@ -250,9 +250,9 @@ Error DirectX::RootSignature::parse(StringRef Data) {
   const char *Current = Data.begin();
 
   // Root Signature headers expects 6 integers to be present.
-  if (Data.size() < 6 * sizeof(uint32_t)) {
-    return parseFailed("Invalid data. Too small.");
-  }
+  if (Data.size() < 6 * sizeof(uint32_t))
+    return parseFailed(
+        "Invalid root signature, insufficient space for header.");
 
   uint32_t VValue =
       support::endian::read<uint32_t, llvm::endianness::little>(Current);

llvm/unittests/Object/DXContainerTest.cpp

@@ -855,8 +855,10 @@ TEST(RootSignature, ParseRootFlags) {
         0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     };
-    EXPECT_THAT_EXPECTED(DXContainer::create(getMemoryBuffer<64>(Buffer)),
-                         FailedWithMessage("Invalid data. Too small."));
+    EXPECT_THAT_EXPECTED(
+        DXContainer::create(getMemoryBuffer<64>(Buffer)),
+        FailedWithMessage(
+            "Invalid root signature, insufficient space for header."));
   }
   {
     // Version has been changed to an invalid number.
@@ -868,8 +870,10 @@ TEST(RootSignature, ParseRootFlags) {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
     };
-    EXPECT_THAT_EXPECTED(DXContainer::create(getMemoryBuffer<68>(Buffer)),
-                         FailedWithMessage("Invalid Version"));
+    EXPECT_THAT_EXPECTED(
+        DXContainer::create(getMemoryBuffer<68>(Buffer)),
+        FailedWithMessage("Stream Error: An unspecified error has occurred.  "
+                          "Invalid Root Signature Version"));
   }
   {
     // Flag has been set to an invalid value
@@ -881,7 +885,9 @@ TEST(RootSignature, ParseRootFlags) {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF,
     };
-    EXPECT_THAT_EXPECTED(DXContainer::create(getMemoryBuffer<68>(Buffer)),
-                         FailedWithMessage("Invalid flag"));
+    EXPECT_THAT_EXPECTED(
+        DXContainer::create(getMemoryBuffer<68>(Buffer)),
+        FailedWithMessage("Stream Error: An unspecified error has occurred.  "
+                          "Invalid Root Signature flag"));
   }
 }