This revision was automatically updated to reflect the committed changes.
Closed by commit rL305812: Fix for Bug 33471: Preventing operator auto from
resolving to a template… (authored by erichkeane).
Changed prior to commit:
https://reviews.llvm.org/D34370?vs=103224&id=103235#toc
Repository:
rL LLVM
https://reviews.llvm.org/D34370
Files:
cfe/trunk/lib/Sema/SemaLookup.cpp
cfe/trunk/test/SemaCXX/cxx1y-deduced-return-type.cpp
Index: cfe/trunk/test/SemaCXX/cxx1y-deduced-return-type.cpp
===================================================================
--- cfe/trunk/test/SemaCXX/cxx1y-deduced-return-type.cpp
+++ cfe/trunk/test/SemaCXX/cxx1y-deduced-return-type.cpp
@@ -55,6 +55,25 @@
return "goodbye";
}
+// Allow 'operator auto' to call only the explicit operator auto.
+struct BothOps {
+ template <typename T> operator T();
+ template <typename T> operator T *();
+ operator auto() { return 0; }
+ operator auto *() { return this; }
+};
+struct JustTemplateOp {
+ template <typename T> operator T();
+ template <typename T> operator T *();
+};
+
+auto c() {
+ BothOps().operator auto(); // ok
+ BothOps().operator auto *(); // ok
+ JustTemplateOp().operator auto(); // expected-error {{no member named
'operator auto' in 'JustTemplateOp'}}
+ JustTemplateOp().operator auto *(); // expected-error {{no member named
'operator auto *' in 'JustTemplateOp'}}
+}
+
auto *ptr_1() {
return 100; // expected-error {{cannot deduce return type 'auto *' from
returned value of type 'int'}}
}
Index: cfe/trunk/lib/Sema/SemaLookup.cpp
===================================================================
--- cfe/trunk/lib/Sema/SemaLookup.cpp
+++ cfe/trunk/lib/Sema/SemaLookup.cpp
@@ -862,6 +862,16 @@
if (!Record->isCompleteDefinition())
return Found;
+ // For conversion operators, 'operator auto' should only match
+ // 'operator auto'. Since 'auto' is not a type, it shouldn't be considered
+ // as a candidate for template substitution.
+ auto *ContainedDeducedType =
+ R.getLookupName().getCXXNameType()->getContainedDeducedType();
+ if (R.getLookupName().getNameKind() ==
+ DeclarationName::CXXConversionFunctionName &&
+ ContainedDeducedType && ContainedDeducedType->isUndeducedType())
+ return Found;
+
for (CXXRecordDecl::conversion_iterator U = Record->conversion_begin(),
UEnd = Record->conversion_end(); U != UEnd; ++U) {
FunctionTemplateDecl *ConvTemplate = dyn_cast<FunctionTemplateDecl>(*U);
Index: cfe/trunk/test/SemaCXX/cxx1y-deduced-return-type.cpp
===================================================================
--- cfe/trunk/test/SemaCXX/cxx1y-deduced-return-type.cpp
+++ cfe/trunk/test/SemaCXX/cxx1y-deduced-return-type.cpp
@@ -55,6 +55,25 @@
return "goodbye";
}
+// Allow 'operator auto' to call only the explicit operator auto.
+struct BothOps {
+ template <typename T> operator T();
+ template <typename T> operator T *();
+ operator auto() { return 0; }
+ operator auto *() { return this; }
+};
+struct JustTemplateOp {
+ template <typename T> operator T();
+ template <typename T> operator T *();
+};
+
+auto c() {
+ BothOps().operator auto(); // ok
+ BothOps().operator auto *(); // ok
+ JustTemplateOp().operator auto(); // expected-error {{no member named 'operator auto' in 'JustTemplateOp'}}
+ JustTemplateOp().operator auto *(); // expected-error {{no member named 'operator auto *' in 'JustTemplateOp'}}
+}
+
auto *ptr_1() {
return 100; // expected-error {{cannot deduce return type 'auto *' from returned value of type 'int'}}
}
Index: cfe/trunk/lib/Sema/SemaLookup.cpp
===================================================================
--- cfe/trunk/lib/Sema/SemaLookup.cpp
+++ cfe/trunk/lib/Sema/SemaLookup.cpp
@@ -862,6 +862,16 @@
if (!Record->isCompleteDefinition())
return Found;
+ // For conversion operators, 'operator auto' should only match
+ // 'operator auto'. Since 'auto' is not a type, it shouldn't be considered
+ // as a candidate for template substitution.
+ auto *ContainedDeducedType =
+ R.getLookupName().getCXXNameType()->getContainedDeducedType();
+ if (R.getLookupName().getNameKind() ==
+ DeclarationName::CXXConversionFunctionName &&
+ ContainedDeducedType && ContainedDeducedType->isUndeducedType())
+ return Found;
+
for (CXXRecordDecl::conversion_iterator U = Record->conversion_begin(),
UEnd = Record->conversion_end(); U != UEnd; ++U) {
FunctionTemplateDecl *ConvTemplate = dyn_cast<FunctionTemplateDecl>(*U);
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
