llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Finn Plummer (inbelic) <details> <summary>Changes</summary> - when there are duplicate `RangeInfo`s created and we will attempt to `llvm::sort` or `llvm::stable_sort` them, it does not appear deterministic in which order they will be sorted (because they are equivalent) - when `DLLVM_ENABLE_EXSTENSIVE_CHECKS` is enabled, it appears to deal with this tie-breaker sorting the list differently than when it is not enabled, this causes one of the test cases to fail because the diagnostic is produced, not in a different order, but with a different identical root element - functionally this makes no difference to the diagnostic being produced, so we will remove the check that it is that specific element in the test This should resolve the build issues reported [here](https://github.com/llvm/llvm-project/pull/147115#issuecomment-3069543491) and [here](https://github.com/llvm/llvm-project/pull/147800#issuecomment-3069797406) --- Full diff: https://github.com/llvm/llvm-project/pull/148649.diff 1 Files Affected: - (modified) clang/test/SemaHLSL/RootSignature-resource-ranges-err.hlsl (+4-13) ``````````diff diff --git a/clang/test/SemaHLSL/RootSignature-resource-ranges-err.hlsl b/clang/test/SemaHLSL/RootSignature-resource-ranges-err.hlsl index 47c06d3fd6381..bac41d13dd6be 100644 --- a/clang/test/SemaHLSL/RootSignature-resource-ranges-err.hlsl +++ b/clang/test/SemaHLSL/RootSignature-resource-ranges-err.hlsl @@ -112,21 +112,12 @@ void bad_root_signature_14() {} // CHECK: [[@LINE-2]]:13: note: expanded from macro 'DuplicatesRootSignature' // CHECK-NEXT: [[@LINE-3]] | "CBV(b0), CBV(b0), CBV(b0), DescriptorTable(CBV(b0, numDescriptors = 2))" // CHECK-NEXT: | ^ -// CHECK: [[@LINE-5]]:4: note: expanded from macro 'DuplicatesRootSignature' +// CHECK: [[@LINE-5]]:22: note: expanded from macro 'DuplicatesRootSignature' // CHECK-NEXT: [[@LINE-6]] | "CBV(b0), CBV(b0), CBV(b0), DescriptorTable(CBV(b0, numDescriptors = 2))" -// CHECK-NEXT: | ^ -// CHECK: [[@LINE-8]]:22: note: expanded from macro 'DuplicatesRootSignature' -// CHECK-NEXT: [[@LINE-9]] | "CBV(b0), CBV(b0), CBV(b0), DescriptorTable(CBV(b0, numDescriptors = 2))" // CHECK-NEXT: | ^ -// CHECK: [[@LINE-11]]:4: note: expanded from macro 'DuplicatesRootSignature' -// CHECK-NEXT: [[@LINE-12]] | "CBV(b0), CBV(b0), CBV(b0), DescriptorTable(CBV(b0, numDescriptors = 2))" -// CHECK-NEXT: | ^ -// CHECK: [[@LINE-14]]:47: note: expanded from macro 'DuplicatesRootSignature' -// CHECK-NEXT: [[@LINE-15]] | "CBV(b0), CBV(b0), CBV(b0), DescriptorTable(CBV(b0, numDescriptors = 2))" -// CHECK-NEXT: | ^ -// CHECK: [[@LINE-17]]:4: note: expanded from macro 'DuplicatesRootSignature' -// CHECK-NEXT: [[@LINE-18]] | "CBV(b0), CBV(b0), CBV(b0), DescriptorTable(CBV(b0, numDescriptors = 2))" -// CHECK-NEXT: | ^ +// CHECK: [[@LINE-8]]:47: note: expanded from macro 'DuplicatesRootSignature' +// CHECK-NEXT: [[@LINE-9]] | "CBV(b0), CBV(b0), CBV(b0), DescriptorTable(CBV(b0, numDescriptors = 2))" +// 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}} `````````` </details> https://github.com/llvm/llvm-project/pull/148649 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
