diff mbox

[C++] PR 57599

Message ID 51BA4E0E.8050909@oracle.com
State New
Headers show

Commit Message

Paolo Carlini June 13, 2013, 10:56 p.m. UTC 
Hi again,

On 06/13/2013 03:51 PM, Jason Merrill wrote:
> Perhaps we should hand off to build_static_cast in the case described 
> by the comment, rather than duplicate the logic.
Thus I have regression tested successfully the below.

Thanks,
Paolo.

////////////////////////////
/cp
2013-06-13  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/57599
	* rtti.c (build_dynamic_cast_1): In case of cast to an unambiguous
	accessible base simply forward to build_static_cast.

/testsuite
2013-06-13  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/57599
	* g++.dg/rtti/dyncast6.C: New.
	* g++.dg/cpp0x/dyncast1.C: Likewise.

Comments

Jason Merrill June 14, 2013, 12:45 a.m. UTC | #1 
OK.

Jason
diff mbox

Patch

Index: cp/rtti.c
===================================================================
--- cp/rtti.c	(revision 200079)
+++ cp/rtti.c	(working copy)
@@ -622,19 +622,10 @@  build_dynamic_cast_1 (tree type, tree expr, tsubst
   /* If *type is an unambiguous accessible base class of *exprtype,
      convert statically.  */
   {
-    tree binfo;
-
-    binfo = lookup_base (TREE_TYPE (exprtype), TREE_TYPE (type),
-			 ba_check, NULL, complain);
-
+    tree binfo = lookup_base (TREE_TYPE (exprtype), TREE_TYPE (type),
+			      ba_check, NULL, complain);
     if (binfo)
-      {
-	expr = build_base_path (PLUS_EXPR, convert_from_reference (expr),
-				binfo, 0, complain);
-	if (TYPE_PTR_P (exprtype))
-	  expr = rvalue (expr);
-	return expr;
-      }
+      return build_static_cast (type, expr, complain);
   }
 
   /* Otherwise *exprtype must be a polymorphic class (have a vtbl).  */
Index: testsuite/g++.dg/cpp0x/dyncast1.C
===================================================================
--- testsuite/g++.dg/cpp0x/dyncast1.C	(revision 0)
+++ testsuite/g++.dg/cpp0x/dyncast1.C	(working copy)
@@ -0,0 +1,31 @@ 
+// PR c++/57599
+// { dg-do compile { target c++11 } }
+
+struct A { };
+struct B : public A { };
+
+template<class, class>
+struct is_same { static constexpr bool value = false; };
+
+template<class T>
+struct is_same<T, T> { static constexpr bool value = true; };
+
+template<class T>
+T val();
+
+static_assert(is_same<decltype(dynamic_cast<A*>(val<B*>())),
+	      A*>::value, "Ouch");
+static_assert(is_same<decltype(dynamic_cast<A&>(val<B&>())),
+	      A&>::value, "Ouch");
+static_assert(is_same<decltype(dynamic_cast<const A*>(val<B*>())),
+	      const A*>::value, "Ouch");
+static_assert(is_same<decltype(dynamic_cast<const A&>(val<B&>())),
+	      const A&>::value, "Ouch");
+static_assert(is_same<decltype(dynamic_cast<volatile A*>(val<B*>())),
+	      volatile A*>::value, "Ouch");
+static_assert(is_same<decltype(dynamic_cast<volatile A&>(val<B&>())),
+	      volatile A&>::value, "Ouch");
+static_assert(is_same<decltype(dynamic_cast<const volatile A*>(val<B*>())),
+	      const volatile A*>::value, "Ouch");
+static_assert(is_same<decltype(dynamic_cast<const volatile A&>(val<B&>())),
+	      const volatile A&>::value, "Ouch");
Index: testsuite/g++.dg/rtti/dyncast6.C
===================================================================
--- testsuite/g++.dg/rtti/dyncast6.C	(revision 0)
+++ testsuite/g++.dg/rtti/dyncast6.C	(working copy)
@@ -0,0 +1,59 @@ 
+// PR c++/57599
+
+class A { };
+
+class B : public A { };
+
+void p()
+{
+  B* b;
+
+  A* a1;
+  a1 = dynamic_cast<A*>(b);
+  a1 = dynamic_cast<const A*>(b);          // { dg-error "invalid" }
+  a1 = dynamic_cast<volatile A*>(b);       // { dg-error "invalid" }
+  a1 = dynamic_cast<const volatile A*>(b); // { dg-error "invalid" }
+
+  const A* a2;
+  a2 = dynamic_cast<A*>(b);
+  a2 = dynamic_cast<const A*>(b);
+  a2 = dynamic_cast<volatile A*>(b);       // { dg-error "invalid" }
+  a2 = dynamic_cast<const volatile A*>(b); // { dg-error "invalid" }
+
+  volatile A* a3;
+  a3 = dynamic_cast<A*>(b);
+  a3 = dynamic_cast<const A*>(b);          // { dg-error "invalid" }
+  a3 = dynamic_cast<volatile A*>(b);
+  a3 = dynamic_cast<const volatile A*>(b); // { dg-error "invalid" }
+
+  const volatile A* a4;
+  a4 = dynamic_cast<A*>(b);
+  a4 = dynamic_cast<const A*>(b);
+  a4 = dynamic_cast<volatile A*>(b);
+  a4 = dynamic_cast<const volatile A*>(b);
+}
+
+void r()
+{
+  B b;
+
+  A& a1 = dynamic_cast<A&>(b);
+  A& a2 = dynamic_cast<const A&>(b);                // { dg-error "invalid" }
+  A& a3 = dynamic_cast<volatile A&>(b);             // { dg-error "invalid" }
+  A& a4 = dynamic_cast<const volatile A&>(b);       // { dg-error "invalid" }
+
+  const A& ca1 = dynamic_cast<A&>(b);
+  const A& ca2 = dynamic_cast<const A&>(b);
+  const A& ca3 = dynamic_cast<volatile A&>(b);       // { dg-error "invalid" }
+  const A& ca4 = dynamic_cast<const volatile A&>(b); // { dg-error "invalid" }
+
+  volatile A& va1 = dynamic_cast<A&>(b);
+  volatile A& va2 = dynamic_cast<const A&>(b);       // { dg-error "invalid" }
+  volatile A& va3 = dynamic_cast<volatile A&>(b);
+  volatile A& va4 = dynamic_cast<const volatile A&>(b);// { dg-error "invalid" }
+
+  const volatile A& cva1 = dynamic_cast<A&>(b);
+  const volatile A& cva2 = dynamic_cast<const A&>(b);
+  const volatile A& cva3 = dynamic_cast<volatile A&>(b);
+  const volatile A& cva4 = dynamic_cast<const volatile A&>(b);
+}