This revision was automatically updated to reflect the committed changes. Closed by commit rC342672: [Sema] Retain __restrict qualifiers when substituting a reference type. (authored by epilk, committed by ).
Changed prior to commit: https://reviews.llvm.org/D52271?vs=166224&id=166334#toc Repository: rC Clang https://reviews.llvm.org/D52271 Files: lib/Sema/TreeTransform.h test/SemaCXX/subst-restrict.cpp Index: test/SemaCXX/subst-restrict.cpp =================================================================== --- test/SemaCXX/subst-restrict.cpp +++ test/SemaCXX/subst-restrict.cpp @@ -0,0 +1,18 @@ +// RUN: %clang_cc1 -std=c++17 -verify %s + +// expected-no-diagnostics + +template <class T> struct add_restrict { + typedef T __restrict type; +}; + +template <class T, class V> struct is_same { + static constexpr bool value = false; +}; + +template <class T> struct is_same<T, T> { + static constexpr bool value = true; +}; + +static_assert(is_same<int & __restrict, add_restrict<int &>::type>::value, ""); +static_assert(is_same<int(), add_restrict<int()>::type>::value, ""); Index: lib/Sema/TreeTransform.h =================================================================== --- lib/Sema/TreeTransform.h +++ lib/Sema/TreeTransform.h @@ -4252,14 +4252,20 @@ // C++ [dcl.fct]p7: // [When] adding cv-qualifications on top of the function type [...] the // cv-qualifiers are ignored. + if (T->isFunctionType()) + return T; + // C++ [dcl.ref]p1: // when the cv-qualifiers are introduced through the use of a typedef-name // or decltype-specifier [...] the cv-qualifiers are ignored. // Note that [dcl.ref]p1 lists all cases in which cv-qualifiers can be // applied to a reference type. - // FIXME: This removes all qualifiers, not just cv-qualifiers! - if (T->isFunctionType() || T->isReferenceType()) - return T; + if (T->isReferenceType()) { + // The only qualifier that applies to a reference type is restrict. + if (!Quals.hasRestrict()) + return T; + Quals = Qualifiers::fromCVRMask(Qualifiers::Restrict); + } // Suppress Objective-C lifetime qualifiers if they don't make sense for the // resulting type.
Index: test/SemaCXX/subst-restrict.cpp =================================================================== --- test/SemaCXX/subst-restrict.cpp +++ test/SemaCXX/subst-restrict.cpp @@ -0,0 +1,18 @@ +// RUN: %clang_cc1 -std=c++17 -verify %s + +// expected-no-diagnostics + +template <class T> struct add_restrict { + typedef T __restrict type; +}; + +template <class T, class V> struct is_same { + static constexpr bool value = false; +}; + +template <class T> struct is_same<T, T> { + static constexpr bool value = true; +}; + +static_assert(is_same<int & __restrict, add_restrict<int &>::type>::value, ""); +static_assert(is_same<int(), add_restrict<int()>::type>::value, ""); Index: lib/Sema/TreeTransform.h =================================================================== --- lib/Sema/TreeTransform.h +++ lib/Sema/TreeTransform.h @@ -4252,14 +4252,20 @@ // C++ [dcl.fct]p7: // [When] adding cv-qualifications on top of the function type [...] the // cv-qualifiers are ignored. + if (T->isFunctionType()) + return T; + // C++ [dcl.ref]p1: // when the cv-qualifiers are introduced through the use of a typedef-name // or decltype-specifier [...] the cv-qualifiers are ignored. // Note that [dcl.ref]p1 lists all cases in which cv-qualifiers can be // applied to a reference type. - // FIXME: This removes all qualifiers, not just cv-qualifiers! - if (T->isFunctionType() || T->isReferenceType()) - return T; + if (T->isReferenceType()) { + // The only qualifier that applies to a reference type is restrict. + if (!Quals.hasRestrict()) + return T; + Quals = Qualifiers::fromCVRMask(Qualifiers::Restrict); + } // Suppress Objective-C lifetime qualifiers if they don't make sense for the // resulting type.
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits