review: remove redundant Index to Element mapping

Author: inbelic

clang/lib/Sema/SemaHLSL.cpp

@@ -1107,9 +1107,8 @@ bool SemaHLSL::handleRootSignatureElements(
   using ResourceRange = llvm::hlsl::rootsig::ResourceRange;
   using GroupT = std::pair<ResourceClass, /*Space*/ uint32_t>;
 
-  // Introduce a mapping from the collected RangeInfos back to the
-  // RootSignatureElement that will retain its diagnostics info
-  llvm::DenseMap<size_t, const hlsl::RootSignatureElement *> InfoIndexMap;
+  // Each RangeInfo will contain an index back to its associated
+  // RootSignatureElement in our Elements ArrayRef
   size_t InfoIndex = 0;
 
   // 1. Collect RangeInfos
@@ -1127,8 +1126,7 @@ bool SemaHLSL::handleRootSignatureElements(
       Info.Space = Descriptor->Space;
       Info.Visibility = Descriptor->Visibility;
 
-      Info.Index = InfoIndex++;
-      InfoIndexMap[Info.Index] = &RootSigElem;
+      Info.Index = InfoIndex;
       Infos.push_back(Info);
     } else if (const auto *Constants =
                    std::get_if<llvm::hlsl::rootsig::RootConstants>(&Elem)) {
@@ -1140,8 +1138,7 @@ bool SemaHLSL::handleRootSignatureElements(
       Info.Space = Constants->Space;
       Info.Visibility = Constants->Visibility;
 
-      Info.Index = InfoIndex++;
-      InfoIndexMap[Info.Index] = &RootSigElem;
+      Info.Index = InfoIndex;
       Infos.push_back(Info);
     } else if (const auto *Sampler =
                    std::get_if<llvm::hlsl::rootsig::StaticSampler>(&Elem)) {
@@ -1153,8 +1150,7 @@ bool SemaHLSL::handleRootSignatureElements(
       Info.Space = Sampler->Space;
       Info.Visibility = Sampler->Visibility;
 
-      Info.Index = InfoIndex++;
-      InfoIndexMap[Info.Index] = &RootSigElem;
+      Info.Index = InfoIndex;
       Infos.push_back(Info);
     } else if (const auto *Clause =
                    std::get_if<llvm::hlsl::rootsig::DescriptorTableClause>(
@@ -1171,8 +1167,7 @@ bool SemaHLSL::handleRootSignatureElements(
       Info.Space = Clause->Space;
 
       // Note: Clause does not hold the visibility this will need to
-      Info.Index = InfoIndex++;
-      InfoIndexMap[Info.Index] = &RootSigElem;
+      Info.Index = InfoIndex;
       Infos.push_back(Info);
     } else if (const auto *Table =
                    std::get_if<llvm::hlsl::rootsig::DescriptorTable>(&Elem)) {
@@ -1186,6 +1181,8 @@ bool SemaHLSL::handleRootSignatureElements(
       for (RangeInfo &Info : TableInfos)
         Info.Visibility = Table->Visibility;
     }
+
+    InfoIndex++;
   }
 
   // 2. Sort the RangeInfo's by their GroupT to form groupings
@@ -1219,14 +1216,13 @@ bool SemaHLSL::handleRootSignatureElements(
   };
 
   // Helper to report diagnostics
-  auto ReportOverlap = [this, InfoIndexMap, &HadOverlap](
-                           const RangeInfo *Info, const RangeInfo *OInfo) {
+  auto ReportOverlap = [this, &Elements, &HadOverlap](const RangeInfo *Info,
+                                                      const RangeInfo *OInfo) {
     HadOverlap = true;
     auto CommonVis = Info->Visibility == llvm::dxbc::ShaderVisibility::All
                          ? OInfo->Visibility
                          : Info->Visibility;
-    const hlsl::RootSignatureElement *Elem = InfoIndexMap.at(Info->Index);
-    SourceLocation InfoLoc = Elem->getLocation();
+    SourceLocation InfoLoc = Elements[Info->Index].getLocation();
     this->Diag(InfoLoc, diag::err_hlsl_resource_range_overlap)
         << llvm::to_underlying(Info->Class) << Info->LowerBound
         << /*unbounded=*/(Info->UpperBound == RangeInfo::Unbounded)
@@ -1235,8 +1231,7 @@ bool SemaHLSL::handleRootSignatureElements(
         << /*unbounded=*/(OInfo->UpperBound == RangeInfo::Unbounded)
         << OInfo->UpperBound << Info->Space << CommonVis;
 
-    const hlsl::RootSignatureElement *OElem = InfoIndexMap.at(OInfo->Index);
-    SourceLocation OInfoLoc = OElem->getLocation();
+    SourceLocation OInfoLoc = Elements[OInfo->Index].getLocation();
     this->Diag(OInfoLoc, diag::note_hlsl_resource_range_here);
   };