Richard,
I think this is the remaining patch of mine waiting for review.
The original post is:
http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20141201/119455.html
but I duplicate the description here. This updated patch fixes formatting, tabs
and tweaks the error text, but otherwise is the same as the earlier posting.
The patch addresses 17456, which is a desire for failed casts involving
classes to give better diagnostic. see
http://llvm.org/bugs/show_bug.cgi?id=17456
Rather than a plain 'cannot cast' error, this patch changes things to:
1) for static cast from 'A *' to 'B *' where T & S are classes, give
'static_cast from 'A *' to unrelated hierarchy 'B *' is not allowed'
2) where a cast fails and involves incomplete classes (directly or as a
pointer), it also notes that the class is incomplete. For instance:
17456.cc:6:10: error: static_cast from 'A *' to unrelated hierarchy 'B *' is not
allowed
return static_cast<B*>(arg);
^~~~~~~~~~~~~~~~~~~~
17456.cc:3:8: note: 'B' is incomplete
struct B;
The test suite already had applicable cases, so this patch just adjusts those
tests.
nathan
Index: src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
===================================================================
--- src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td (revision 226857)
+++ src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td (working copy)
@@ -5265,6 +5265,10 @@ def err_bad_cstyle_cast_overload : Error
def err_bad_cxx_cast_generic : Error<
"%select{const_cast|static_cast|reinterpret_cast|dynamic_cast|C-style cast|"
"functional-style cast}0 from %1 to %2 is not allowed">;
+def err_bad_cxx_cast_unrelated : Error<
+ "%select{const_cast|static_cast|reinterpret_cast|dynamic_cast|C-style cast|"
+ "functional-style cast}0 from %1 to unrelated hierarchy %2 is not allowed">;
+def note_type_incomplete : Note<"%0 is incomplete">;
def err_bad_cxx_cast_rvalue : Error<
"%select{const_cast|static_cast|reinterpret_cast|dynamic_cast|C-style cast|"
"functional-style cast}0 from rvalue to reference type %2">;
Index: src/tools/clang/lib/Sema/SemaCast.cpp
===================================================================
--- src/tools/clang/lib/Sema/SemaCast.cpp (revision 226857)
+++ src/tools/clang/lib/Sema/SemaCast.cpp (working copy)
@@ -389,6 +389,27 @@ static void diagnoseBadCast(Sema &S, uns
S.Diag(opRange.getBegin(), msg) << castType
<< src->getType() << destType << opRange << src->getSourceRange();
+
+ // Detect if types are incomplete, and note it.
+ QualType Type = destType;
+ if (auto Ptr = Type->getAs<PointerType> ())
+ Type = Ptr->getPointeeType ();
+ if (auto Rec = Type->getAs<RecordType> ()) {
+ auto Decl = Rec->getAsCXXRecordDecl ();
+ if (!Decl->isCompleteDefinition ())
+ S.Diag (Decl->getLocation (), diag::note_type_incomplete)
+ << Decl->getDeclName ();
+ }
+
+ Type = src->getType();
+ if (auto Ptr = Type->getAs<PointerType> ())
+ Type = Ptr->getPointeeType ();
+ if (auto Rec = Type->getAs<RecordType> ()) {
+ auto Decl = Rec->getAsCXXRecordDecl ();
+ if (!Decl->isCompleteDefinition ())
+ S.Diag (Decl->getLocation (), diag::note_type_incomplete)
+ << Decl->getDeclName ();
+ }
}
/// UnwrapDissimilarPointerTypes - Like Sema::UnwrapSimilarPointerTypes,
@@ -1087,6 +1108,14 @@ static TryCastResult TryStaticCast(Sema
if (!CStyle &&
Self.CheckTollFreeBridgeStaticCast(DestType, SrcExpr.get(), Kind))
return TC_Success;
+
+ // See if it looks like the user is trying to convert between
+ // related record types, and select a better diagnostic if so.
+ if (auto SrcPointer = SrcType->getAs<PointerType>())
+ if (auto DestPointer = DestType->getAs<PointerType>())
+ if (SrcPointer->getPointeeType()->getAs<RecordType>()
+ && DestPointer->getPointeeType()->getAs<RecordType>())
+ msg = diag::err_bad_cxx_cast_unrelated;
// We tried everything. Everything! Nothing works! :-(
return TC_NotApplicable;
Index: src/tools/clang/test/CXX/temp/temp.param/p15-cxx0x.cpp
===================================================================
--- src/tools/clang/test/CXX/temp/temp.param/p15-cxx0x.cpp (revision 226857)
+++ src/tools/clang/test/CXX/temp/temp.param/p15-cxx0x.cpp (working copy)
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -std=c++11 -verify %s
-template<typename T> struct X;
+template<typename T> struct X; // expected-note {{'X' is incomplete}}
template<int I> struct Y;
X<X<int>> *x1;
Index: src/tools/clang/test/SemaCXX/static-cast.cpp
===================================================================
--- src/tools/clang/test/SemaCXX/static-cast.cpp (revision 226857)
+++ src/tools/clang/test/SemaCXX/static-cast.cpp (working copy)
@@ -9,8 +9,8 @@ struct F : public C1 {}; // S
struct G1 : public B {};
struct G2 : public B {};
struct H : public G1, public G2 {}; // Ambiguous path to B.
-struct I; // Incomplete.
-struct J; // Incomplete.
+struct I; // Incomplete. expected-note {{'I' is incomplete}}
+struct J; // Incomplete. expected-note {{'J' is incomplete}}
enum Enum { En1, En2 };
enum Onom { On1, On2 };
@@ -92,9 +92,13 @@ void t_529_5_8()
(void)static_cast<E&>(*((A*)0)); // expected-error {{cannot cast private base class 'A' to 'E'}}
(void)static_cast<H*>((A*)0); // expected-error {{ambiguous cast from base 'A' to derived 'H':\n struct A -> struct B -> struct G1 -> struct H\n struct A -> struct B -> struct G2 -> struct H}}
(void)static_cast<H&>(*((A*)0)); // expected-error {{ambiguous cast from base 'A' to derived 'H':\n struct A -> struct B -> struct G1 -> struct H\n struct A -> struct B -> struct G2 -> struct H}}
- (void)static_cast<E*>((B*)0); // expected-error {{static_cast from 'B *' to 'E *' is not allowed}}
+ (void)static_cast<E*>((B*)0); // expected-error {{static_cast from 'B *' to unrelated hierarchy 'E *' is not allowed}}
(void)static_cast<E&>(*((B*)0)); // expected-error {{non-const lvalue reference to type 'E' cannot bind to a value of unrelated type 'B'}}
+
+ (void)static_cast<E*>((J*)0); // expected-error {{static_cast from 'J *' to unrelated hierarchy 'E *' is not allowed}}
+ (void)static_cast<I*>((B*)0); // expected-error {{static_cast from 'B *' to unrelated hierarchy 'I *' is not allowed}}
+
// TODO: Test inaccessible base in context where it's accessible, i.e.
// member function and friend.
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
