From beb683ab93023d2e80edd30dd8630fb7ae89aae0 Mon Sep 17 00:00:00 2001 From: Martin Jambor Date: Fri, 13 Jun 2014 16:26:51 +0200 Subject: [PATCH] re PR ipa/61186 (./g++.dg/ipa/pr52939.C & valgrind & pointer_set_insert) 2014-06-13 Martin Jambor PR ipa/61186 * ipa-devirt.c (possible_polymorphic_call_targets): Store NULL to cache_token if returning early. From-SVN: r211641 --- gcc/ChangeLog | 6 ++++++ gcc/ipa-devirt.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index df39537c785..3620dac70f4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-06-13 Martin Jambor + + PR ipa/61186 + * ipa-devirt.c (possible_polymorphic_call_targets): Store NULL to + cache_token if returning early. + 2014-06-13 Nick Clifton * 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 d733461f34a..a90d1dcd736 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;