From df5c5f782883994df067140982464df293687cfd Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Sun, 17 Mar 2013 16:32:17 -0400 Subject: [PATCH] re PR c++/17232 ([DR 1640] classes and class template specializations treated differently w.r.t. core issue #337) PR c++/17232 PR c++/56642 * typeck2.c (abstract_virtuals_error_sfinae): Revert complete_type change for now. From-SVN: r196758 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/typeck2.c | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index dc094f72848..b341e929790 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2013-03-17 Jason Merrill + + PR c++/17232 + PR c++/56642 + * typeck2.c (abstract_virtuals_error_sfinae): Revert complete_type + change for now. + 2013-03-16 Jason Merrill * decl.c (grokdeclarator): Assert that we won't see a pointer to diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index 3bac67cf119..24b55938527 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -265,10 +265,6 @@ abstract_virtuals_error_sfinae (tree decl, tree type, abstract_class_use use, return 0; type = TYPE_MAIN_VARIANT (type); - /* In SFINAE context, force instantiation. */ - if (!(complain & tf_error)) - complete_type (type); - /* If the type is incomplete, we register it within a hash table, so that we can check again once it is completed. This makes sense only for objects for which we have a declaration or at least a