[PATCH] D46820: Fix __uuidof handling on non-type template parameter in C++17
thakis closed this revision. thakis added a comment. r332614, thanks! Repository: rC Clang https://reviews.llvm.org/D46820 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D46820: Fix __uuidof handling on non-type template parameter in C++17
tzik marked an inline comment as done. tzik added inline comments. Comment at: test/SemaCXX/PR24986.cpp:12 + f<&__uuidof(0)>(); +} thakis wrote: > Maybe this test could be in test/SemaCXX/ms-uuid.cpp instead? OK, moved there. Repository: rC Clang https://reviews.llvm.org/D46820 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D46820: Fix __uuidof handling on non-type template parameter in C++17
tzik updated this revision to Diff 147238.
Repository:
rC Clang
https://reviews.llvm.org/D46820
Files:
lib/Sema/SemaTemplate.cpp
test/SemaCXX/ms-uuid.cpp
Index: test/SemaCXX/ms-uuid.cpp
===
--- test/SemaCXX/ms-uuid.cpp
+++ test/SemaCXX/ms-uuid.cpp
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -fms-extensions %s
-Wno-deprecated-declarations
+// RUN: %clang_cc1 -fsyntax-only -std=c++17 -verify -fms-extensions %s
-Wno-deprecated-declarations
typedef struct _GUID {
unsigned long Data1;
@@ -92,4 +93,16 @@
// the previous case).
[uuid("00A0---C000-0049"),
uuid("00A0---C000-0049")] class C10;
+
+template
+void F1() {
+ // Regression test for PR24986. The given GUID should just work as a pointer.
+ const GUID* q = p;
+}
+
+void F2() {
+ // The UUID should work for a non-type template parameter.
+ F1<&__uuidof(C1)>();
+}
+
}
Index: lib/Sema/SemaTemplate.cpp
===
--- lib/Sema/SemaTemplate.cpp
+++ lib/Sema/SemaTemplate.cpp
@@ -6245,7 +6245,7 @@
// -- a predefined __func__ variable
if (auto *E = Value.getLValueBase().dyn_cast()) {
if (isa(E)) {
- Converted = TemplateArgument(const_cast(E));
+ Converted = TemplateArgument(ArgResult.get());
break;
}
Diag(Arg->getLocStart(), diag::err_template_arg_not_decl_ref)
Index: test/SemaCXX/ms-uuid.cpp
===
--- test/SemaCXX/ms-uuid.cpp
+++ test/SemaCXX/ms-uuid.cpp
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -fms-extensions %s -Wno-deprecated-declarations
+// RUN: %clang_cc1 -fsyntax-only -std=c++17 -verify -fms-extensions %s -Wno-deprecated-declarations
typedef struct _GUID {
unsigned long Data1;
@@ -92,4 +93,16 @@
// the previous case).
[uuid("00A0---C000-0049"),
uuid("00A0---C000-0049")] class C10;
+
+template
+void F1() {
+ // Regression test for PR24986. The given GUID should just work as a pointer.
+ const GUID* q = p;
+}
+
+void F2() {
+ // The UUID should work for a non-type template parameter.
+ F1<&__uuidof(C1)>();
+}
+
}
Index: lib/Sema/SemaTemplate.cpp
===
--- lib/Sema/SemaTemplate.cpp
+++ lib/Sema/SemaTemplate.cpp
@@ -6245,7 +6245,7 @@
// -- a predefined __func__ variable
if (auto *E = Value.getLValueBase().dyn_cast()) {
if (isa(E)) {
- Converted = TemplateArgument(const_cast(E));
+ Converted = TemplateArgument(ArgResult.get());
break;
}
Diag(Arg->getLocStart(), diag::err_template_arg_not_decl_ref)
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D46820: Fix __uuidof handling on non-type template parameter in C++17
thakis accepted this revision. thakis added a comment. This revision is now accepted and ready to land. lgtm, but: Comment at: test/SemaCXX/PR24986.cpp:12 + f<&__uuidof(0)>(); +} Maybe this test could be in test/SemaCXX/ms-uuid.cpp instead? Repository: rC Clang https://reviews.llvm.org/D46820 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D46820: Fix __uuidof handling on non-type template parameter in C++17
tzik added a comment. rsmith: Could you PTAL to this? Repository: rC Clang https://reviews.llvm.org/D46820 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D46820: Fix __uuidof handling on non-type template parameter in C++17
tzik created this revision.
tzik added reviewers: rsmith, thakis.
Herald added a subscriber: cfe-commits.
Clang used to pass the base lvalue of a non-type template parameter
to the template instantiation phase when the base part is __uuidof
and it's running in C++17 mode.
However, that drops its LValuePath, and unintentionally transforms
`&__uuidof(...)` to `__uuidof(...)`.
This CL fixes that by passing whole expr. Fixes PR24986.
Repository:
rC Clang
https://reviews.llvm.org/D46820
Files:
lib/Sema/SemaTemplate.cpp
test/SemaCXX/PR24986.cpp
Index: test/SemaCXX/PR24986.cpp
===
--- /dev/null
+++ test/SemaCXX/PR24986.cpp
@@ -0,0 +1,12 @@
+// RUN: %clang_cc1 -fsyntax-only -fms-extensions -std=c++17 %s
+
+typedef struct _GUID {} GUID;
+
+template
+void f() {
+ const GUID* q = p;
+}
+
+void g() {
+ f<&__uuidof(0)>();
+}
Index: lib/Sema/SemaTemplate.cpp
===
--- lib/Sema/SemaTemplate.cpp
+++ lib/Sema/SemaTemplate.cpp
@@ -6197,7 +6197,7 @@
// -- a predefined __func__ variable
if (auto *E = Value.getLValueBase().dyn_cast()) {
if (isa(E)) {
- Converted = TemplateArgument(const_cast(E));
+ Converted = TemplateArgument(ArgResult.get());
break;
}
Diag(Arg->getLocStart(), diag::err_template_arg_not_decl_ref)
Index: test/SemaCXX/PR24986.cpp
===
--- /dev/null
+++ test/SemaCXX/PR24986.cpp
@@ -0,0 +1,12 @@
+// RUN: %clang_cc1 -fsyntax-only -fms-extensions -std=c++17 %s
+
+typedef struct _GUID {} GUID;
+
+template
+void f() {
+ const GUID* q = p;
+}
+
+void g() {
+ f<&__uuidof(0)>();
+}
Index: lib/Sema/SemaTemplate.cpp
===
--- lib/Sema/SemaTemplate.cpp
+++ lib/Sema/SemaTemplate.cpp
@@ -6197,7 +6197,7 @@
// -- a predefined __func__ variable
if (auto *E = Value.getLValueBase().dyn_cast()) {
if (isa(E)) {
- Converted = TemplateArgument(const_cast(E));
+ Converted = TemplateArgument(ArgResult.get());
break;
}
Diag(Arg->getLocStart(), diag::err_template_arg_not_decl_ref)
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
