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 df39537c785fa0ad395460192e945d8684e9364d..3620dac70f47652dcbae46e6ffdbcc914a1897bc 100644 (file)
--- 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 d733461f34a10b00fb3a7496ed76f2447f244dd3..a90d1dcd736b04040c4fba32e43704e2ef904631 100644 (file)
--- 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;