aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjamborm <jamborm@138bc75d-0d04-0410-961f-82ee72b054a4>2014-06-13 14:34:14 +0000
committerjamborm <jamborm@138bc75d-0d04-0410-961f-82ee72b054a4>2014-06-13 14:34:14 +0000
commit8a8e83e2dcdb126addb6c544d28a98d8d694ed3b (patch)
tree0ae78534a52188c5c8b3d2f59debae2a7534b680
parentb1820bb3cced52f507718604a707ca79bef096fc (diff)
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@211646 138bc75d-0d04-0410-961f-82ee72b054a4
-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 8109aee921d..2345df817b2 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-12 Jakub Jelinek <jakub@redhat.com>
PR middle-end/61486
diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index 7f07d2f94ae..0671a8b781c 100644
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -1449,6 +1449,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;
@@ -1459,6 +1461,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;
@@ -1472,6 +1476,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;