svn merge -r130397:139561 svn+ssh://gcc.gnu.org/svn/gcc/branches/redhat/gcc-4_1-branchredhat/fc6-4_1-branch

git-svn-id: https://gcc.gnu.org/svn/gcc/branches/redhat/fc6-4_1-branch@139562 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 1 insertions, 13 deletions

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index b9941bc4015..508982d3e4c 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -714,19 +714,7 @@ standard_conversion (tree to, tree from, tree expr, bool c_cast_p,
 		  that necessitates this conversion is ill-formed.
 		  Therefore, we use DERIVED_FROM_P, and do not check
 		  access or uniqueness.  */
-	       && DERIVED_FROM_P (TREE_TYPE (to), TREE_TYPE (from))
-	       /* If FROM is not yet complete, then we must be parsing
-		  the body of a class.  We know what's derived from
-		  what, but we can't actually perform a
-		  derived-to-base conversion.  For example, in:
-
-		     struct D : public B { 
-                       static const int i = sizeof((B*)(D*)0);
-                     };
-
-                  the D*-to-B* conversion is a reinterpret_cast, not a
-		  static_cast.  */
-	       && COMPLETE_TYPE_P (TREE_TYPE (from)))
+	       && DERIVED_FROM_P (TREE_TYPE (to), TREE_TYPE (from)))
 	{
 	  from =
 	    cp_build_qualified_type (TREE_TYPE (to),