proto: dealing with duplicates

Author: inbelic

clang/lib/Sema/SemaHLSL.cpp

@@ -1165,19 +1165,19 @@ bool SemaHLSL::handleRootSignatureElements(
     Infos.push_back(Pair.first);
 
   // Helpers to report diagnostics
+  uint32_t DuplicateCounter = 0;
   using ElemPair = std::pair<const hlsl::RootSignatureElement *,
                              const hlsl::RootSignatureElement *>;
-  auto GetElemPair = [&Infos, &InfoPairs](
+  auto GetElemPair = [&Infos, &InfoPairs, &DuplicateCounter](
                          OverlappingRanges Overlap) -> ElemPair {
     auto InfoB = std::lower_bound(Infos.begin(), Infos.end(), *Overlap.B);
     auto DistB = std::distance(Infos.begin(), InfoB);
     auto PairB = InfoPairs.begin();
     std::advance(PairB, DistB);
 
     auto InfoA = std::lower_bound(InfoB, Infos.end(), *Overlap.A);
-    if (InfoA == InfoB)
-      InfoA++;
-    auto DistA = std::distance(InfoB, InfoA);
+    DuplicateCounter = InfoA == InfoB ? DuplicateCounter + 1 : 0;
+    auto DistA = std::distance(InfoB, InfoA) + DuplicateCounter;
     auto PairA = PairB;
     std::advance(PairA, DistA);
 

clang/test/SemaHLSL/RootSignature-resource-ranges-err.hlsl

@@ -105,3 +105,34 @@ void valid_root_signature_13() {}
 // expected-note@+1 {{overlapping resource range here}}
 [RootSignature(DemoNoteSourceLocations)]
 void bad_root_signature_14() {}
+
+#define DuplicatesRootSignature \
+  "CBV(b0), CBV(b0), CBV(b0), CBV(b0)"
+
+// CHECK: [[@LINE-2]]:13: note: expanded from macro 'DuplicatesRootSignature'
+// CHECK-NEXT: [[@LINE-3]] |   "CBV(b0), CBV(b0), CBV(b0), CBV(b0)"
+// CHECK-NEXT:             |             ^
+// CHECK: [[@LINE-5]]:4: note: expanded from macro 'DuplicatesRootSignature'
+// CHECK-NEXT: [[@LINE-6]] |   "CBV(b0), CBV(b0), CBV(b0), CBV(b0)"
+// CHECK-NEXT:             |    ^
+// CHECK: [[@LINE-8]]:22: note: expanded from macro 'DuplicatesRootSignature'
+// CHECK-NEXT: [[@LINE-9]] |   "CBV(b0), CBV(b0), CBV(b0), CBV(b0)"
+// CHECK-NEXT:             |                      ^
+// CHECK: [[@LINE-11]]:4: note: expanded from macro 'DuplicatesRootSignature'
+// CHECK-NEXT: [[@LINE-12]] |   "CBV(b0), CBV(b0), CBV(b0), CBV(b0)"
+// CHECK-NEXT:              |    ^
+// CHECK: [[@LINE-14]]:31: note: expanded from macro 'DuplicatesRootSignature'
+// CHECK-NEXT: [[@LINE-15]] |   "CBV(b0), CBV(b0), CBV(b0), CBV(b0)"
+// CHECK-NEXT:              |                               ^
+// CHECK: [[@LINE-17]]:4: note: expanded from macro 'DuplicatesRootSignature'
+// CHECK-NEXT: [[@LINE-18]] |   "CBV(b0), CBV(b0), CBV(b0), CBV(b0)"
+// CHECK-NEXT:              |    ^
+
+// expected-error@+6 {{resource ranges b[0;0] and b[0;0] overlap within space = 0 and visibility = All}}
+// expected-note@+5 {{overlapping resource range here}}
+// expected-error@+4 {{resource ranges b[0;0] and b[0;0] overlap within space = 0 and visibility = All}}
+// expected-note@+3 {{overlapping resource range here}}
+// expected-error@+2 {{resource ranges b[0;0] and b[0;0] overlap within space = 0 and visibility = All}}
+// expected-note@+1 {{overlapping resource range here}}
+[RootSignature(DuplicatesRootSignature)]
+void valid_root_signature_15() {}