[PATCH] D52271: [Sema] Ensure that we retain __restrict qualifiers when substituting a reference type.

[Erik Pilkington via Phabricator via cfe-commits]

erik.pilkington created this revision.
erik.pilkington added reviewers: rsmith, rjmccall.
Herald added a subscriber: dexonsmith.

Fixes rdar://43760099. Thanks for taking a look!


Repository:
  rC Clang

https://reviews.llvm.org/D52271

Files:
  clang/lib/Sema/TreeTransform.h
  clang/test/SemaCXX/subst-restrict.cpp


Index: clang/test/SemaCXX/subst-restrict.cpp
===================================================================
--- /dev/null
+++ clang/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: clang/lib/Sema/TreeTransform.h
===================================================================
--- clang/lib/Sema/TreeTransform.h
+++ clang/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.
+  // Presumably, [dcl.fct]p7 would have applied to __restrict (and all the other
+  // qualifiers we support).
+  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()) {
+    Quals.removeConst();
+    Quals.removeVolatile();
+  }
 
   // Suppress Objective-C lifetime qualifiers if they don't make sense for the
   // resulting type.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D52271.166150.patch
Type: text/x-patch
Size: 1769 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20180919/32e892f3/attachment.bin>