Fix 2 typos in IPA ICF pass

	* gcc.dg/ipa/ipa-icf-32.c: Removed one scanned pattern.
	    Martin Liska  <mliska@suse.cz>

	PR ipa/78099
	* common.opt: Mark flag_ipa_icf_variables as Optimization flag.
	* ipa-icf.c (sem_function::get_hash): Add target optimization
	node to hash.

From-SVN: r241510

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index aaf07f436d7a834a6a3af1e65ec1aeb7e553b58d..e0601576db7ca09f1c6e37b54ef1d23048f3b186 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2016-10-25  H.J. Lu  <hongjiu.lu@intel.com>
+           Martin Liska  <mliska@suse.cz>
+
+       PR ipa/78099
+       * common.opt: Mark flag_ipa_icf_variables as Optimization flag.
+       * ipa-icf.c (sem_function::get_hash): Add target optimization
+       node to hash.
+
 2016-10-25  Wilco Dijkstra  <wdijkstr@arm.com>
 
        PR target/78041

diff --git a/gcc/common.opt b/gcc/common.opt
index eefbb4601bd3eb52886f931cc80f0f7e0a2e8711..1872d51b417ab8a992f2c192109cdaf72555e362 100644 (file)
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -1597,7 +1597,7 @@ Common Report Var(flag_ipa_icf_functions) Optimization
 Perform Identical Code Folding for functions.
 
 fipa-icf-variables
-Common Report Var(flag_ipa_icf_variables)
+Common Report Var(flag_ipa_icf_variables) Optimization
 Perform Identical Code Folding for variables.
 
 fipa-reference

diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c
index 3886fa66180958e87a844ad1433db25dc8419792..e8880cb4fe2a9e04e9b7fb6d246156b66c4ca2e7 100644 (file)
--- a/gcc/ipa-icf.c
+++ b/gcc/ipa-icf.c
@@ -300,6 +300,7 @@ sem_function::get_hash (void)
         (cl_target_option_hash
           (TREE_TARGET_OPTION (DECL_FUNCTION_SPECIFIC_TARGET (decl))));
       if (DECL_FUNCTION_SPECIFIC_OPTIMIZATION (decl))
+       hstate.add_wide_int
         (cl_optimization_hash
           (TREE_OPTIMIZATION (DECL_FUNCTION_SPECIFIC_OPTIMIZATION (decl))));
       hstate.add_flag (DECL_CXX_CONSTRUCTOR_P (decl));

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 02d8ac6303d44941a0573ffdc5cc8eb695309cf4..c7c233f6c920f32fc607df4947616d211fb945f0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2016-10-25  Martin Liska  <mliska@suse.cz>
+
+       * gcc.dg/ipa/ipa-icf-32.c: Removed one scanned pattern.
+
 2016-10-25  Wilco Dijkstra  <wdijkstr@arm.com>
 
        PR target/78041

diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-32.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-32.c
index 9f42918b067752023b7229b1d3283e95fffc258f..df11ac5f154dbf11d1a30c0b7fde90e7e4f24678 100644 (file)
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-32.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-32.c
@@ -19,5 +19,4 @@ int main()
   return foo (0) + bar (0);
 }
 
-/* { dg-final { scan-ipa-dump "optimization flags are different" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf"  } } */