aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMartin Jambor <mjambor@suse.cz>2014-06-13 16:26:51 +0200
committerMartin Jambor <jamborm@gcc.gnu.org>2014-06-13 16:26:51 +0200
commitbeb683ab93023d2e80edd30dd8630fb7ae89aae0 (patch)
treec66afab34373f8911f83fae1590d1111029a4e7d /gcc
parent2abacbaec75089488500b57c1805ebb0bd21e616 (diff)
downloadgcc-beb683ab93023d2e80edd30dd8630fb7ae89aae0.zip
gcc-beb683ab93023d2e80edd30dd8630fb7ae89aae0.tar.gz
gcc-beb683ab93023d2e80edd30dd8630fb7ae89aae0.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/ipa-devirt.c6
2 files changed, 12 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df39537..3620dac 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 d733461..a90d1dc 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;