From: Martin Jambor <mjambor@suse.cz>
Date: Fri, 13 Jun 2014 14:26:51 +0000 (+0200)
Subject: re PR ipa/61186 (./g++.dg/ipa/pr52939.C & valgrind & pointer_set_insert)
X-Git-Tag: releases/gcc-5.1.0~6889
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=beb683ab93023d2e80edd30dd8630fb7ae89aae0;p=thirdparty%2Fgcc.git

re PR ipa/61186 (./g++.dg/ipa/pr52939.C & valgrind & pointer_set_insert)

2014-06-13  Martin Jambor  <mjambor@suse.cz>

	PR ipa/61186
	* ipa-devirt.c (possible_polymorphic_call_targets): Store NULL to
	cache_token if returning early.

From-SVN: r211641
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df39537c785f..3620dac70f47 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-13  Martin Jambor  <mjambor@suse.cz>
+
+	PR ipa/61186
+	* ipa-devirt.c (possible_polymorphic_call_targets): Store NULL to
+	cache_token if returning early.
+
 2014-06-13  Nick Clifton  <nickc@redhat.com>
 
 	* config/rx/rx.h (JUMP_ALIGN): Return the log value if user
diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index d733461f34a1..a90d1dcd736b 100644
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -1603,6 +1603,8 @@ possible_polymorphic_call_targets (tree otr_type,
     {
       if (completep)
 	*completep = false;
+      if (cache_token)
+	*cache_token = NULL;
       if (nonconstruction_targetsp)
 	*nonconstruction_targetsp = 0;
       return nodes;
@@ -1613,6 +1615,8 @@ possible_polymorphic_call_targets (tree otr_type,
     {
       if (completep)
 	*completep = true;
+      if (cache_token)
+	*cache_token = NULL;
       if (nonconstruction_targetsp)
 	*nonconstruction_targetsp = 0;
       return nodes;
@@ -1626,6 +1630,8 @@ possible_polymorphic_call_targets (tree otr_type,
     {
       if (completep)
 	*completep = false;
+      if (cache_token)
+	*cache_token = NULL;
       if (nonconstruction_targetsp)
 	*nonconstruction_targetsp = 0;
       return nodes;