address errors

Author: joaosaffran

llvm/include/llvm/Object/DXContainer.h

@@ -160,6 +160,10 @@ struct RootConstantView : RootParameterView {
   }
 };
 
+static Error parseFailed(const Twine &Msg) {
+  return make_error<GenericBinaryError>(Msg.str(), object_error::parse_failed);
+}
+
 class RootSignature {
 private:
   uint32_t Version = 2;
@@ -192,23 +196,25 @@ class RootSignature {
   }
   param_header_iterator param_header_end() { return ParametersHeaders.end(); }
   uint32_t getFlags() const { return Flags; }
-  RootParameterView
+
+  llvm::Expected<RootParameterView>
   getParameter(const dxbc::RootParameterHeader &Header) const {
     size_t CorrectOffset = Header.ParameterOffset - ParameterSpaceOffset;
     StringRef Data;
 
-    size_t DataSize = 0;
+    size_t DataSize;
 
     switch (Header.ParameterType) {
     case dxbc::RootParameterType::Constants32Bit:
       DataSize = sizeof(dxbc::RootConstants);
-      if (CorrectOffset + DataSize > ParameterSpace.size()) {
-        // throw
-      }
-      Data = ParameterSpace.substr(CorrectOffset, DataSize);
       break;
     }
 
+    if (CorrectOffset + DataSize > ParameterSpace.size())
+      return parseFailed("Reading structure out of file bounds");
+
+    Data = ParameterSpace.substr(CorrectOffset, DataSize);
+
     RootParameterView View = RootParameterView(Header, Data);
     return View;
   }

llvm/lib/ObjectYAML/DXContainerYAML.cpp

@@ -45,9 +45,13 @@ DXContainerYAML::RootSignatureYamlDesc::RootSignatureYamlDesc(
     NewP.Type = PH.ParameterType;
     NewP.Visibility = PH.ShaderVisibility;
 
-    auto ParamView = Data.getParameter(PH);
+    llvm::Expected<object::DirectX::RootParameterView> ParamView =
+        Data.getParameter(PH);
+    if (!ParamView)
+      llvm::errs() << "Error: " << ParamView.takeError() << "\n";
+    auto PV = *ParamView;
 
-    if (auto *RCV = dyn_cast<object::DirectX::RootConstantView>(&ParamView)) {
+    if (auto *RCV = dyn_cast<object::DirectX::RootConstantView>(&PV)) {
       auto Constants = RCV->read();
       if (!Constants)
         llvm::errs() << "Error: " << Constants.takeError() << "\n";

llvm/unittests/Object/DXContainerTest.cpp

@@ -926,9 +926,10 @@ TEST(RootSignature, ParseRootConstant) {
     ASSERT_EQ((unsigned)RootParam.ParameterType, 1u);
     ASSERT_EQ((unsigned)RootParam.ShaderVisibility, 2u);
     auto ParamView = RS.getParameter(RootParam);
+    ASSERT_THAT_ERROR(ParamView.takeError(), Succeeded());
 
     DirectX::RootConstantView *RootConstantsView =
-        dyn_cast<DirectX::RootConstantView>(&ParamView);
+        dyn_cast<DirectX::RootConstantView>(&*ParamView);
     ASSERT_TRUE(RootConstantsView != nullptr);
     auto Constants = RootConstantsView->read();
 
@@ -999,11 +1000,8 @@ TEST(RootSignature, ParseRootConstant) {
     const auto &RS = MaybeRS.value();
     auto RootParam = *RS.param_header().begin();
     auto ParamView = RS.getParameter(RootParam);
-    DirectX::RootConstantView *RootConstantsView =
-        dyn_cast<DirectX::RootConstantView>(&ParamView);
-    ASSERT_TRUE(RootConstantsView != nullptr);
-    EXPECT_THAT_EXPECTED(
-        RootConstantsView->read(),
+    ASSERT_THAT_ERROR(
+        ParamView.takeError(),
         FailedWithMessage("Reading structure out of file bounds"));
   }
 }