From: hubicka <hubicka@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 9 Dec 2015 19:40:10 +0000 (+0000)
Subject: 	PR ipa/61886
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58da8146e0e39e5b337a0f8b0a19538efd7d699f;p=thirdparty%2Fgcc.git

	PR ipa/61886
	* ipa-visibility.c (function_and_variable_visibility): Fix vtable
	rewritting guard.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231474 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 22e87afdda57..44f621b73f2d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-08  Jan Hubicka  <hubicka@ucw.cz>
+
+	PR ipa/61886
+	* ipa-visibility.c (function_and_variable_visibility): Fix vtable
+	rewritting guard.
+
 2015-12-08  Jan Hubicka  <hubicka@ucw.cz>
 
 	PR ipa/61886
@@ -135,7 +141,6 @@
 	* tree-vectorizer.h (set_vinfo_for_stmt): Assert we don't
 	overwrite an existing entry.
 
->>>>>>> .r231469
 2015-12-09  Chung-Lin Tang  <cltang@codesourcery.com>
 
 	* c-family/c-omp.c (c_finish_oacc_wait): Remove add_stmt() call.
diff --git a/gcc/ipa-visibility.c b/gcc/ipa-visibility.c
index 5b03159197ce..7ce8266c4661 100644
--- a/gcc/ipa-visibility.c
+++ b/gcc/ipa-visibility.c
@@ -720,7 +720,7 @@ function_and_variable_visibility (bool whole_program)
 	  bool found = false;
 
 	  /* See if there is something to update.  */
-	  for (i = 0; vnode->iterate_referring (i, ref); i++)
+	  for (i = 0; vnode->iterate_reference (i, ref); i++)
 	    if (ref->use == IPA_REF_ADDR
 		&& can_replace_by_local_alias_in_vtable (ref->referred))
 	      {