llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: None (offsetof) <details> <summary>Changes</summary> Avoid adding `const` on too many levels to the qualification-combined type when going from "array of `N`" to "array of unknown bound of". Fixes #<!-- -->66599 --- Full diff: https://github.com/llvm/llvm-project/pull/88905.diff 2 Files Affected: - (modified) clang/lib/Sema/SemaExprCXX.cpp (+2-2) - (modified) clang/test/SemaCXX/cxx20-p0388-unbound-ary.cpp (+25-1) ``````````diff diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp index 74ed3fe7bd5201..e704ca28bed7cf 100644 --- a/clang/lib/Sema/SemaExprCXX.cpp +++ b/clang/lib/Sema/SemaExprCXX.cpp @@ -7260,8 +7260,8 @@ QualType Sema::FindCompositePointerType(SourceLocation Loc, Composite1 = Arr1->getElementType(); Composite2 = Arr2->getElementType(); Steps.emplace_back(Step::Array); - if (CAT1 || CAT2) - NeedConstBefore = Steps.size(); + if ((CAT1 || CAT2) && Steps.size() > 2) + NeedConstBefore = Steps.size() - 2; continue; } } diff --git a/clang/test/SemaCXX/cxx20-p0388-unbound-ary.cpp b/clang/test/SemaCXX/cxx20-p0388-unbound-ary.cpp index f2d5cabad235d0..0e428110d7988c 100644 --- a/clang/test/SemaCXX/cxx20-p0388-unbound-ary.cpp +++ b/clang/test/SemaCXX/cxx20-p0388-unbound-ary.cpp @@ -170,4 +170,28 @@ void g3() { } // namespace Eight -#endif +namespace Nine { + +template<auto, class> +constexpr bool is_of_type = false; + +template<class T, T expr> +constexpr bool is_of_type<expr, T> = true; + +using T1 = int (*)[1]; +using T2 = int (*)[]; +static_assert(is_of_type<0 ? T1() : T2(), T2>); + +using U1 = int* (**)[1]; +using U2 = int* (**)[]; +using U3 = int* (* const*)[]; +static_assert(is_of_type<0 ? U1() : U2(), U3>); + +using V1 = int* (*(**)[])[1]; +using V2 = int* (*(**)[1])[]; +using V3 = int* (* const(* const*)[])[]; +static_assert(is_of_type<0 ? V1() : V2(), V3>); + +} // namespace Nine + +#endif // __cplusplus >= 202002 `````````` </details> https://github.com/llvm/llvm-project/pull/88905 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
