| This patch fixes a crash in release build clang and produces the desired diagnostic. In the debug build clang it does not crash but produces a misleading diagnostic. Problem is that in TryUserDefinedConversion(…) We have: case OR_Deleted: // …. if (CXXConstructorDecl *Constructor = dyn_cast<CXXConstructorDecl>(ICS.UserDefined.ConversionFunction)) { // … } And ICS.UserDefined.ConversionFunction never gets set for a ‘delete’ constructor. Please review. - Fariborz |
Index: lib/Sema/SemaOverload.cpp
===================================================================
--- lib/Sema/SemaOverload.cpp (revision 234797)
+++ lib/Sema/SemaOverload.cpp (working copy)
@@ -2954,7 +2954,10 @@
bool HadMultipleCandidates = (CandidateSet.size() > 1);
OverloadCandidateSet::iterator Best;
- switch (CandidateSet.BestViableFunction(S, From->getLocStart(), Best, true))
{
+ OverloadingResult OVLReasult =
+ CandidateSet.BestViableFunction(S, From->getLocStart(), Best, true);
+ switch (OVLReasult) {
+ case OR_Deleted:
case OR_Success: {
// Record the standard conversion we used and the conversion function.
CXXConstructorDecl *Constructor = cast<CXXConstructorDecl>(Best->Function);
@@ -2967,13 +2970,11 @@
User.After.setAsIdentityConversion();
User.After.setFromType(ThisType->getAs<PointerType>()->getPointeeType());
User.After.setAllToTypes(ToType);
- return OR_Success;
+ return OVLReasult;
}
case OR_No_Viable_Function:
return OR_No_Viable_Function;
- case OR_Deleted:
- return OR_Deleted;
case OR_Ambiguous:
return OR_Ambiguous;
}
Index: test/SemaCXX/cxx11-call-to-deleted-constructor.cpp
===================================================================
--- test/SemaCXX/cxx11-call-to-deleted-constructor.cpp (revision 0)
+++ test/SemaCXX/cxx11-call-to-deleted-constructor.cpp (working copy)
@@ -0,0 +1,41 @@
+// RUN: %clang_cc1 -std=c++11 -fsyntax-only -verify %s
+// rdar://20281011
+
+namespace std {
+template<class _Ep> class initializer_list { };
+}
+
+namespace cva {
+
+template <class VT, unsigned int ROWS = 0, unsigned int COLS = 0>
+class Matrix {
+public:
+
+ typedef VT value_type;
+ inline __attribute__((always_inline)) value_type& at();
+};
+
+template <class VT, unsigned int SIZE> using Vector = Matrix<VT, SIZE, 1>;
+
+template <class VT>
+using RGBValue = Vector<VT, 3>;
+using RGBFValue = RGBValue<float>;
+
+template <class VT> class Matrix<VT, 0, 0> { // expected-note {{passing
argument to parameter here}}
+public:
+ typedef VT value_type;
+ Matrix(const unsigned int nRows, const unsigned int nColumns, const
value_type* data = nullptr);
+
+ Matrix(const std::initializer_list<value_type>& list) = delete; //
expected-note {{'Matrix' has been explicitly marked deleted here}}
+
+};
+
+void getLaplacianClosedForm()
+{
+ Matrix<double> winI(0, 3);
+ RGBFValue* inputPreL;
+ winI = { inputPreL->at() }; // expected-error {{call to deleted
constructor of 'cva::Matrix<double, 0, 0> &&'}}
+}
+
+}
+
_______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
