Message ID | 20110413142350.GK17079@tyan-ft48-01.lab.bos.redhat.com |
---|---|
State | New |
Headers | show |
On 04/13/2011 10:23 AM, Jakub Jelinek wrote: > Then > > --- gcc/cp/class.c.jj 2011-04-12 19:43:49.000000000 +0200 > +++ gcc/cp/class.c 2011-04-13 15:23:07.463670993 +0200 > @@ -5939,6 +5939,7 @@ fixed_type_or_null (tree instance, int * > itself. */ > if (TREE_CODE (instance) == VAR_DECL > && DECL_INITIAL (instance) > + && !type_dependent_expression_p (DECL_INITIAL (instance)) > && !htab_find (ht, instance)) > { > tree type; > > would be shorter, after that if it returns NULL_TREE. Yep. Jason
--- gcc/cp/class.c.jj 2011-04-12 19:43:49.000000000 +0200 +++ gcc/cp/class.c 2011-04-13 15:23:07.463670993 +0200 @@ -5939,6 +5939,7 @@ fixed_type_or_null (tree instance, int * itself. */ if (TREE_CODE (instance) == VAR_DECL && DECL_INITIAL (instance) + && !type_dependent_expression_p (DECL_INITIAL (instance)) && !htab_find (ht, instance)) { tree type;