diff mbox

[PR70187] Safely use nodes[0] in possible_polymorphic_call_targets

Message ID 56E915B8.5090503@mentor.com
State New
Headers show

Commit Message

Tom de Vries March 16, 2016, 8:13 a.m. UTC
Hi,

this patch fixes lto PR70187, a 6 regression.

We run into an ICE in in possible_polymorphic_call_targets when 
accessing nodes[0]->decl because nodes == vNULL:
...
   if (!outer_type->all_derivations_known)
     {
       if (!speculative && final_warning_records
           && TREE_CODE (TREE_TYPE (nodes[0]->decl)) == METHOD_TYPE)
         {
           if (complete
               && nodes.length () == 1
               && warn_suggest_final_types
               && !outer_type->derived_types.length ())
             {
...

The patch fixes this by moving the 'nodes.length () == 1' test to before 
the use of nodes[0].

Bootstrapped and reg-tested on x86_64.

OK for stage4 trunk?

Thanks,
- Tom

Comments

Richard Biener March 16, 2016, 9:44 a.m. UTC | #1
On Wed, Mar 16, 2016 at 9:13 AM, Tom de Vries <Tom_deVries@mentor.com> wrote:
> Hi,
>
> this patch fixes lto PR70187, a 6 regression.
>
> We run into an ICE in in possible_polymorphic_call_targets when accessing
> nodes[0]->decl because nodes == vNULL:
> ...
>   if (!outer_type->all_derivations_known)
>     {
>       if (!speculative && final_warning_records
>           && TREE_CODE (TREE_TYPE (nodes[0]->decl)) == METHOD_TYPE)
>         {
>           if (complete
>               && nodes.length () == 1
>               && warn_suggest_final_types
>               && !outer_type->derived_types.length ())
>             {
> ...
>
> The patch fixes this by moving the 'nodes.length () == 1' test to before the
> use of nodes[0].
>
> Bootstrapped and reg-tested on x86_64.
>
> OK for stage4 trunk?

Ok (even obvious I think).

Thanks,
Richard.

> Thanks,
> - Tom
Jan Hubicka March 17, 2016, 8:58 a.m. UTC | #2
> Hi,
> 
> this patch fixes lto PR70187, a 6 regression.
> 
> We run into an ICE in in possible_polymorphic_call_targets when
> accessing nodes[0]->decl because nodes == vNULL:
> ...
>   if (!outer_type->all_derivations_known)
>     {
>       if (!speculative && final_warning_records
>           && TREE_CODE (TREE_TYPE (nodes[0]->decl)) == METHOD_TYPE)
>         {
>           if (complete
>               && nodes.length () == 1
>               && warn_suggest_final_types
>               && !outer_type->derived_types.length ())
>             {
> ...
> 
> The patch fixes this by moving the 'nodes.length () == 1' test to
> before the use of nodes[0].
> 
> Bootstrapped and reg-tested on x86_64.
> 
> OK for stage4 trunk?
> 
> Thanks,
> - Tom

> Safely use nodes[0] in possible_polymorphic_call_targets
> 
> 2016-03-16  Tom de Vries  <tom@codesourcery.com>
> 
> 	PR lto/70187
> 	* ipa-devirt.c (possible_polymorphic_call_targets): Move
> 	nodes.length () == 1 test to before first nodes[0] access.

OK,
thanks
Honza
diff mbox

Patch

Safely use nodes[0] in possible_polymorphic_call_targets

2016-03-16  Tom de Vries  <tom@codesourcery.com>

	PR lto/70187
	* ipa-devirt.c (possible_polymorphic_call_targets): Move
	nodes.length () == 1 test to before first nodes[0] access.

---
 gcc/ipa-devirt.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index e4fb562..4df171b 100644
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -3178,10 +3178,10 @@  possible_polymorphic_call_targets (tree otr_type,
 	  if (!outer_type->all_derivations_known)
 	    {
 	      if (!speculative && final_warning_records
+		  && nodes.length () == 1
 		  && TREE_CODE (TREE_TYPE (nodes[0]->decl)) == METHOD_TYPE)
 		{
 		  if (complete
-		      && nodes.length () == 1
 		      && warn_suggest_final_types
 		      && !outer_type->derived_types.length ())
 		    {
@@ -3197,7 +3197,6 @@  possible_polymorphic_call_targets (tree otr_type,
 		    }
 		  if (complete
 		      && warn_suggest_final_methods
-		      && nodes.length () == 1
 		      && types_same_for_odr (DECL_CONTEXT (nodes[0]->decl),
 					     outer_type->type))
 		    {