making updateOngoingOffset shared

Author: joaosaffran

clang/lib/Sema/SemaHLSL.cpp

@@ -1378,9 +1378,8 @@ bool SemaHLSL::handleRootSignatureElements(
           Diag(Loc, diag::err_hlsl_offset_overflow) << Offset << RangeBound;
         }
 
-        Offset = RangeBound == llvm::hlsl::rootsig::NumDescriptorsUnbounded
-                     ? uint32_t(RangeBound)
-                     : uint32_t(RangeBound + 1);
+        Offset = llvm::hlsl::rootsig::updateOngoingOffset(
+            Offset, Clause->NumDescriptors, Clause->Offset);
 
         // Compute the register bounds and track resource binding
         uint32_t LowerBound(Clause->Reg.Number);

llvm/include/llvm/Frontend/HLSL/RootSignatureValidations.h

@@ -45,6 +45,8 @@ LLVM_ABI bool verifyLOD(float LOD);
 LLVM_ABI bool verifyBoundOffset(uint32_t Offset);
 LLVM_ABI bool verifyNoOverflowedOffset(uint64_t Offset);
 LLVM_ABI uint64_t computeRangeBound(uint32_t Offset, uint32_t Size);
+LLVM_ABI uint64_t updateOngoingOffset(uint64_t CurOffset,
+                                      uint64_t NumDescriptors, uint64_t Offset);
 
 } // namespace rootsig
 } // namespace hlsl

llvm/lib/Frontend/HLSL/RootSignatureMetadata.cpp

@@ -68,14 +68,6 @@ extractShaderVisibility(MDNode *Node, unsigned int OpId) {
   return make_error<InvalidRSMetadataValue>("ShaderVisibility");
 }
 
-static uint64_t updateOngoingOffset(uint64_t CurOfset, uint64_t NumDescriptors,
-                                    uint64_t Offset) {
-  // Append to the current offset if DescriptorTableOffsetAppend is set,
-  // otherwise calculate the new Offset.
-  return Offset == DescriptorTableOffsetAppend ? CurOfset + NumDescriptors
-                                               : Offset + NumDescriptors;
-}
-
 namespace {
 
 // We use the OverloadVisit with std::visit to ensure the compiler catches if a
@@ -586,7 +578,6 @@ Error validateDescriptorTableRegisterOverflow(mcdxbc::DescriptorTable Table,
     if (!verifyNoOverflowedOffset(OffsetBound))
       return make_error<DescriptorRangeOverflowError>(
           RangeType, Range.BaseShaderRegister, Range.RegisterSpace);
-
     Offset = updateOngoingOffset(Offset, Range.NumDescriptors,
                                  Range.OffsetInDescriptorsFromTableStart);
   }

llvm/lib/Frontend/HLSL/RootSignatureValidations.cpp

@@ -182,6 +182,14 @@ uint64_t computeRangeBound(uint32_t Offset, uint32_t Size) {
   return uint64_t(Offset) + uint64_t(Size) - 1;
 }
 
+uint64_t updateOngoingOffset(uint64_t CurOffset, uint64_t NumDescriptors,
+                             uint64_t Offset) {
+  // Append to the current offset if DescriptorTableOffsetAppend is set,
+  // otherwise calculate the new Offset.
+  return Offset == DescriptorTableOffsetAppend ? CurOffset + NumDescriptors
+                                               : Offset + NumDescriptors;
+}
+
 } // namespace rootsig
 } // namespace hlsl
 } // namespace llvm