Commit 4f75413f by Paolo Carlini Committed by Paolo Carlini

re PR c++/50732 ([type_traits] is_base_of<Base, Derived> unnecessarily…

re PR c++/50732 ([type_traits] is_base_of<Base, Derived> unnecessarily instantiates Base (which shouldn't be instantiated))

/cp
2011-10-15  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/50732
	* semantics.c (finish_trait_expr): Do not try to instantiate the
	the base type of an __is_base_of trait.
	(check_trait_type): Return a tree; use complete_type_or_else.

/testsuite
2011-10-15  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/50732
	* g++.dg/ext/is_base_of_incomplete.C: New.
	* g++.dg/ext/is_base_of_diagnostic.C: Adjust dg-errors.
	* g++.dg/ext/unary_trait_incomplete.C: Likewise.

From-SVN: r180048
parent 2635892a
2011-10-15 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/50732
* semantics.c (finish_trait_expr): Do not try to instantiate the
the base type of an __is_base_of trait.
(check_trait_type): Return a tree; use complete_type_or_else.
2011-10-14 Jason Merrill <jason@redhat.com> 2011-10-14 Jason Merrill <jason@redhat.com>
PR c++/50563 PR c++/50563
......
...@@ -5210,23 +5210,20 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2) ...@@ -5210,23 +5210,20 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2)
} }
} }
/* Returns true if TYPE is a complete type, an array of unknown bound, /* If TYPE is an array of unknown bound, or (possibly cv-qualified)
or (possibly cv-qualified) void, returns false otherwise. */ void, or a complete type, returns it, otherwise NULL_TREE. */
static bool static tree
check_trait_type (tree type) check_trait_type (tree type)
{ {
if (COMPLETE_TYPE_P (type))
return true;
if (TREE_CODE (type) == ARRAY_TYPE && !TYPE_DOMAIN (type) if (TREE_CODE (type) == ARRAY_TYPE && !TYPE_DOMAIN (type)
&& COMPLETE_TYPE_P (TREE_TYPE (type))) && COMPLETE_TYPE_P (TREE_TYPE (type)))
return true; return type;
if (VOID_TYPE_P (type)) if (VOID_TYPE_P (type))
return true; return type;
return false; return complete_type_or_else (strip_array_types (type), NULL_TREE);
} }
/* Process a trait expression. */ /* Process a trait expression. */
...@@ -5276,10 +5273,6 @@ finish_trait_expr (cp_trait_kind kind, tree type1, tree type2) ...@@ -5276,10 +5273,6 @@ finish_trait_expr (cp_trait_kind kind, tree type1, tree type2)
return trait_expr; return trait_expr;
} }
complete_type (type1);
if (type2)
complete_type (type2);
switch (kind) switch (kind)
{ {
case CPTK_HAS_NOTHROW_ASSIGN: case CPTK_HAS_NOTHROW_ASSIGN:
...@@ -5298,20 +5291,15 @@ finish_trait_expr (cp_trait_kind kind, tree type1, tree type2) ...@@ -5298,20 +5291,15 @@ finish_trait_expr (cp_trait_kind kind, tree type1, tree type2)
case CPTK_IS_STD_LAYOUT: case CPTK_IS_STD_LAYOUT:
case CPTK_IS_TRIVIAL: case CPTK_IS_TRIVIAL:
if (!check_trait_type (type1)) if (!check_trait_type (type1))
{ return error_mark_node;
error ("incomplete type %qT not allowed", type1);
return error_mark_node;
}
break; break;
case CPTK_IS_BASE_OF: case CPTK_IS_BASE_OF:
if (NON_UNION_CLASS_TYPE_P (type1) && NON_UNION_CLASS_TYPE_P (type2) if (NON_UNION_CLASS_TYPE_P (type1) && NON_UNION_CLASS_TYPE_P (type2)
&& !same_type_ignoring_top_level_qualifiers_p (type1, type2) && !same_type_ignoring_top_level_qualifiers_p (type1, type2)
&& !COMPLETE_TYPE_P (type2)) && !complete_type_or_else (type2, NULL_TREE))
{ /* We already issued an error. */
error ("incomplete type %qT not allowed", type2); return error_mark_node;
return error_mark_node;
}
break; break;
case CPTK_IS_CLASS: case CPTK_IS_CLASS:
......
2011-10-15 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/50732
* g++.dg/ext/is_base_of_incomplete.C: New.
* g++.dg/ext/is_base_of_diagnostic.C: Adjust dg-errors.
* g++.dg/ext/unary_trait_incomplete.C: Likewise.
2011-10-15 Eric Botcazou <ebotcazou@adacore.com> 2011-10-15 Eric Botcazou <ebotcazou@adacore.com>
* gcc.target/sparc/combined-1.c: Compile at -O2. * gcc.target/sparc/combined-1.c: Compile at -O2.
......
class A class A
{ }; { };
class B; class B; // { dg-error "forward declaration" }
union C union C
{ }; { };
......
// PR c++/50732
template <typename T>
struct non_instantiable
{
typedef typename T::THIS_TYPE_CANNOT_BE_INSTANTIATED type;
};
int check[__is_base_of(non_instantiable<int>, void) ? -1 : 1];
// PR c++/39475 // PR c++/39475
struct I; struct I; // { dg-error "forward declaration" }
struct C { }; struct C { };
bool nas1 = __has_nothrow_assign(I); // { dg-error "incomplete type" } bool nas1 = __has_nothrow_assign(I); // { dg-error "incomplete type" }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment