remove optional from type

Author: joaosaffran

llvm/include/llvm/Frontend/HLSL/HLSLBinding.h

@@ -133,21 +133,19 @@ class BoundRegs {
 public:
   BoundRegs(SmallVector<Binding> &&Bindings) : Bindings(std::move(Bindings)) {}
 
-  std::optional<const Binding *> findBoundReg(dxil::ResourceClass RC,
-                                              uint32_t Space,
-                                              uint32_t LowerBound,
-                                              uint32_t UpperBound) const {
+  const Binding *findBoundReg(dxil::ResourceClass RC, uint32_t Space,
+                              uint32_t LowerBound, uint32_t UpperBound) const {
     // UpperBound and Cookie are given dummy values, since they aren't
     // interesting for operator<
     const Binding *It =
         llvm::upper_bound(Bindings, Binding{RC, Space, LowerBound, 0, nullptr});
     if (It == Bindings.begin())
-      return std::nullopt;
+      return nullptr;
     --It;
     if (It->RC == RC && It->Space == Space && It->LowerBound <= LowerBound &&
         It->UpperBound >= UpperBound)
       return It;
-    return std::nullopt;
+    return nullptr;
   }
 };
 

llvm/lib/Target/DirectX/DXILPostOptimizationValidation.cpp

@@ -250,13 +250,13 @@ static void validateRootSignature(Module &M,
     dxil::ResourceClass RC = RTI.getResourceClass();
     dxil::ResourceKind RK = RTI.getResourceKind();
 
-    std::optional<const llvm::hlsl::Binding *> Reg =
+    const llvm::hlsl::Binding *Reg =
         BoundRegs.findBoundReg(RC, Binding.Space, Binding.LowerBound,
                                Binding.LowerBound + Binding.Size - 1);
 
-    if (Reg.has_value()) {
+    if (Reg != nullptr) {
       const auto *ParamInfo =
-          static_cast<const mcdxbc::RootParameterInfo *>((*Reg)->Cookie);
+          static_cast<const mcdxbc::RootParameterInfo *>(Reg->Cookie);
 
       if (RC != ResourceClass::SRV && RC != ResourceClass::UAV)
         continue;