nfc: rename some things

Author: inbelic

clang/lib/Sema/SemaHLSL.cpp

@@ -1335,7 +1335,7 @@ bool SemaHLSL::handleRootSignatureElements(
       bool HasNonSampler = false;
       uint32_t Offset = 0;
       for (const auto &[Clause, ClauseElem] : UnboundClauses) {
-        SourceLocation Loc = RootSigElem.getLocation();
+        SourceLocation Loc = ClauseElem->getLocation();
         if (Clause->Type == llvm::dxil::ResourceClass::Sampler)
           HasSampler = true;
         else
@@ -1356,19 +1356,20 @@ bool SemaHLSL::handleRootSignatureElements(
           Offset = Clause->Offset;
         }
 
-        uint64_t NextOffset =
-            llvm::hlsl::rootsig::nextOffset(Offset, Clause->NumDescriptors);
+        uint64_t RangeBound = llvm::hlsl::rootsig::computeRangeBound(
+            Offset, Clause->NumDescriptors);
 
         if (!llvm::hlsl::rootsig::verifyBoundOffset(Offset)) {
           // Trying to append onto unbound offset
           Diag(Loc, diag::err_hlsl_appending_onto_unbound);
-        } else if (!llvm::hlsl::rootsig::verifyNoOverflowedOffset(NextOffset -
-                                                                  1)) {
+        } else if (!llvm::hlsl::rootsig::verifyNoOverflowedOffset(RangeBound)) {
           // Upper bound overflows maximum offset
-          Diag(Loc, diag::err_hlsl_offset_overflow) << Offset << NextOffset - 1;
+          Diag(Loc, diag::err_hlsl_offset_overflow) << Offset << RangeBound;
         }
 
-        Offset = uint32_t(NextOffset);
+        Offset = RangeBound == llvm::hlsl::rootsig::NumDescriptorsUnbounded
+                     ? uint32_t(RangeBound)
+                     : uint32_t(RangeBound + 1);
 
         // Compute the register bounds and track resource binding
         uint32_t LowerBound(Clause->Reg.Number);

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

@@ -43,7 +43,7 @@ LLVM_ABI bool verifyLOD(float LOD);
 
 LLVM_ABI bool verifyBoundOffset(uint32_t Offset);
 LLVM_ABI bool verifyNoOverflowedOffset(uint64_t Offset);
-LLVM_ABI uint64_t nextOffset(uint32_t Offset, uint32_t Size);
+LLVM_ABI uint64_t computeRangeBound(uint32_t Offset, uint32_t Size);
 
 } // namespace rootsig
 } // namespace hlsl

llvm/lib/Frontend/HLSL/RootSignatureValidations.cpp

@@ -188,11 +188,12 @@ bool verifyNoOverflowedOffset(uint64_t Offset) {
   return Offset <= std::numeric_limits<uint32_t>::max();
 }
 
-uint64_t nextOffset(uint32_t Offset, uint32_t Size) {
+uint64_t computeRangeBound(uint32_t Offset, uint32_t Size) {
+  assert(0 < Size && "Must be a non-empty range");
   if (Size == NumDescriptorsUnbounded)
     return NumDescriptorsUnbounded;
 
-  return uint64_t(Offset) + uint64_t(Size);
+  return uint64_t(Offset) + uint64_t(Size) - 1;
 }
 
 } // namespace rootsig