From cfe-commits  Fri Jul 24 20:22:04 2015
From: Nathan Wilson <nwilson20 () gmail ! com>
Date: Fri, 24 Jul 2015 20:22:04 +0000
To: cfe-commits
Subject: Re: [PATCH] D11490: [Concepts] Add diagnostic: non template declaration
Message-Id: <e3931acda826dbd562c4d54f5adcc525 () localhost ! localdomain>
X-MARC-Message: https://marc.info/?l=cfe-commits&m=143777033310536
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--b1_e3931acda826dbd562c4d54f5adcc525"

--b1_e3931acda826dbd562c4d54f5adcc525
Content-Type: text/plain; charset = "utf-8"
Content-Transfer-Encoding: quoted-printable

nwilson updated this revision to Diff 30598.
nwilson added a comment.

modifying diagnostic message to: 'concept' can only appear on the definitio=
n of a function template or variable template


http://reviews.llvm.org/D11490

Files:
  include/clang/Basic/DiagnosticSemaKinds.td
  lib/Sema/SemaDecl.cpp
  test/SemaCXX/cxx-concept-declaration.cpp

Index: test/SemaCXX/cxx-concept-declaration.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- test/SemaCXX/cxx-concept-declaration.cpp
+++ test/SemaCXX/cxx-concept-declaration.cpp
@@ -15,3 +15,7 @@
 struct C {
   template<typename T> static concept bool D3 =3D true; // expected-error =
{{concept declarations may only appear in namespace scope}}
 };
+
+concept bool D4() { return true; } // expected-error {{'concept' can only =
appear on the definition of a function template or variable template}}
+
+concept bool D5 =3D true; // expected-error {{'concept' can only appear on=
 the definition of a function template or variable template}}
Index: lib/Sema/SemaDecl.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- lib/Sema/SemaDecl.cpp
+++ lib/Sema/SemaDecl.cpp
@@ -4865,6 +4865,12 @@
     // C++ Concepts TS [dcl.spec.concept]p1: The concept specifier shall be
     // applied only to the definition of a function template or variable
     // template, declared in namespace scope
+    if (!TemplateParamLists.size()) {
+      Diag(D.getDeclSpec().getConceptSpecLoc(),
+           diag::err_concept_decl_non_template);
+      return nullptr;
+    }
+
     if (!DC->getRedeclContext()->isFileContext()) {
       Diag(D.getIdentifierLoc(),
            diag::err_concept_decls_may_only_appear_in_namespace_scope);
Index: include/clang/Basic/DiagnosticSemaKinds.td
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- include/clang/Basic/DiagnosticSemaKinds.td
+++ include/clang/Basic/DiagnosticSemaKinds.td
@@ -1966,6 +1966,8 @@
   "use __attribute__((visibility(\"hidden\"))) attribute instead">;
=20
 // C++ Concepts TS
+def err_concept_decl_non_template : Error<
+  "'concept' can only appear on the definition of a function template or v=
ariable template">;
 def err_concept_decls_may_only_appear_in_namespace_scope : Error<
   "concept declarations may only appear in namespace scope">;
 def err_function_concept_not_defined : Error<



--b1_e3931acda826dbd562c4d54f5adcc525
Content-Type: text/x-patch; charset=utf-8; name="D11490.30598.patch"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="D11490.30598.patch"

SW5kZXg6IHRlc3QvU2VtYUNYWC9jeHgtY29uY2VwdC1kZWNsYXJhdGlvbi5j
cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gdGVzdC9TZW1hQ1hYL2N4
eC1jb25jZXB0LWRlY2xhcmF0aW9uLmNwcAorKysgdGVzdC9TZW1hQ1hYL2N4
eC1jb25jZXB0LWRlY2xhcmF0aW9uLmNwcApAQCAtMTUsMyArMTUsNyBAQAog
c3RydWN0IEMgewogICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBzdGF0aWMgY29u
Y2VwdCBib29sIEQzID0gdHJ1ZTsgLy8gZXhwZWN0ZWQtZXJyb3Ige3tjb25j
ZXB0IGRlY2xhcmF0aW9ucyBtYXkgb25seSBhcHBlYXIgaW4gbmFtZXNwYWNl
IHNjb3BlfX0KIH07CisKK2NvbmNlcHQgYm9vbCBENCgpIHsgcmV0dXJuIHRy
dWU7IH0gLy8gZXhwZWN0ZWQtZXJyb3Ige3snY29uY2VwdCcgY2FuIG9ubHkg
YXBwZWFyIG9uIHRoZSBkZWZpbml0aW9uIG9mIGEgZnVuY3Rpb24gdGVtcGxh
dGUgb3IgdmFyaWFibGUgdGVtcGxhdGV9fQorCitjb25jZXB0IGJvb2wgRDUg
PSB0cnVlOyAvLyBleHBlY3RlZC1lcnJvciB7eydjb25jZXB0JyBjYW4gb25s
eSBhcHBlYXIgb24gdGhlIGRlZmluaXRpb24gb2YgYSBmdW5jdGlvbiB0ZW1w
bGF0ZSBvciB2YXJpYWJsZSB0ZW1wbGF0ZX19CkluZGV4OiBsaWIvU2VtYS9T
ZW1hRGVjbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gbGliL1Nl
bWEvU2VtYURlY2wuY3BwCisrKyBsaWIvU2VtYS9TZW1hRGVjbC5jcHAKQEAg
LTQ4NjUsNiArNDg2NSwxMiBAQAogICAgIC8vIEMrKyBDb25jZXB0cyBUUyBb
ZGNsLnNwZWMuY29uY2VwdF1wMTogVGhlIGNvbmNlcHQgc3BlY2lmaWVyIHNo
YWxsIGJlCiAgICAgLy8gYXBwbGllZCBvbmx5IHRvIHRoZSBkZWZpbml0aW9u
IG9mIGEgZnVuY3Rpb24gdGVtcGxhdGUgb3IgdmFyaWFibGUKICAgICAvLyB0
ZW1wbGF0ZSwgZGVjbGFyZWQgaW4gbmFtZXNwYWNlIHNjb3BlCisgICAgaWYg
KCFUZW1wbGF0ZVBhcmFtTGlzdHMuc2l6ZSgpKSB7CisgICAgICBEaWFnKEQu
Z2V0RGVjbFNwZWMoKS5nZXRDb25jZXB0U3BlY0xvYygpLAorICAgICAgICAg
ICBkaWFnOjplcnJfY29uY2VwdF9kZWNsX25vbl90ZW1wbGF0ZSk7CisgICAg
ICByZXR1cm4gbnVsbHB0cjsKKyAgICB9CisKICAgICBpZiAoIURDLT5nZXRS
ZWRlY2xDb250ZXh0KCktPmlzRmlsZUNvbnRleHQoKSkgewogICAgICAgRGlh
ZyhELmdldElkZW50aWZpZXJMb2MoKSwKICAgICAgICAgICAgZGlhZzo6ZXJy
X2NvbmNlcHRfZGVjbHNfbWF5X29ubHlfYXBwZWFyX2luX25hbWVzcGFjZV9z
Y29wZSk7CkluZGV4OiBpbmNsdWRlL2NsYW5nL0Jhc2ljL0RpYWdub3N0aWNT
ZW1hS2luZHMudGQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gaW5jbHVk
ZS9jbGFuZy9CYXNpYy9EaWFnbm9zdGljU2VtYUtpbmRzLnRkCisrKyBpbmNs
dWRlL2NsYW5nL0Jhc2ljL0RpYWdub3N0aWNTZW1hS2luZHMudGQKQEAgLTE5
NjYsNiArMTk2Niw4IEBACiAgICJ1c2UgX19hdHRyaWJ1dGVfXygodmlzaWJp
bGl0eShcImhpZGRlblwiKSkpIGF0dHJpYnV0ZSBpbnN0ZWFkIj47CiAKIC8v
IEMrKyBDb25jZXB0cyBUUworZGVmIGVycl9jb25jZXB0X2RlY2xfbm9uX3Rl
bXBsYXRlIDogRXJyb3I8CisgICInY29uY2VwdCcgY2FuIG9ubHkgYXBwZWFy
IG9uIHRoZSBkZWZpbml0aW9uIG9mIGEgZnVuY3Rpb24gdGVtcGxhdGUgb3Ig
dmFyaWFibGUgdGVtcGxhdGUiPjsKIGRlZiBlcnJfY29uY2VwdF9kZWNsc19t
YXlfb25seV9hcHBlYXJfaW5fbmFtZXNwYWNlX3Njb3BlIDogRXJyb3I8CiAg
ICJjb25jZXB0IGRlY2xhcmF0aW9ucyBtYXkgb25seSBhcHBlYXIgaW4gbmFt
ZXNwYWNlIHNjb3BlIj47CiBkZWYgZXJyX2Z1bmN0aW9uX2NvbmNlcHRfbm90
X2RlZmluZWQgOiBFcnJvcjwK

--b1_e3931acda826dbd562c4d54f5adcc525
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
cfe-commits mailing list
cfe-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits

--b1_e3931acda826dbd562c4d54f5adcc525--