Temporary fix for PR63566.

	* ipa-icf.c (sem_function::merge): Local flags are set to false
	to enforce equal calling convention to be used.
	* opts.c (common_handle_option): Indentation fix.

From-SVN: r216386

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 704de2f1f80c8601543d3defa7c1dc47bf8e0826..c3167864c1b7a33af3f4b4092550918460e0992f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-17  Martin Liska  <mliska@suse.cz>
+
+       * ipa-icf.c (sem_function::merge): Local flags are set to false
+       to enforce equal calling convention to be used.
+       * opts.c (common_handle_option): Indentation fix.
+
 2014-10-17  Marc Glisse  <marc.glisse@inria.fr>
 
        * tree-into-ssa.c (is_old_name): Replace "new" with "old".

diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c
index f7510b33975540b49ed39340cfe98b75e771170b..0e6bd9a6073afb9c84318ffbb0ca1f2fbc7a2bff 100644 (file)
--- a/gcc/ipa-icf.c
+++ b/gcc/ipa-icf.c
@@ -630,6 +630,11 @@ sem_function::merge (sem_item *alias_item)
       cgraph_node::create_alias (alias_func->decl, decl);
       alias->resolve_alias (original);
 
+      /* Workaround for PR63566 that forces equal calling convention
+        to be used.  */
+      alias->local.local = false;
+      original->local.local = false;
+
       if (dump_file)
        fprintf (dump_file, "Callgraph alias has been created.\n\n");
     }

diff --git a/gcc/opts.c b/gcc/opts.c
index dc8ddf4cd37c56a0cf30a6fb26f93b77c8c432f0..305419620186b62fe6bfd5d8eb1097fc149312fb 100644 (file)
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -1982,8 +1982,8 @@ common_handle_option (struct gcc_options *opts,
       break;
 
     case OPT_fipa_icf:
-       opts->x_flag_ipa_icf_functions = value;
-       opts->x_flag_ipa_icf_variables = value;
+      opts->x_flag_ipa_icf_functions = value;
+      opts->x_flag_ipa_icf_variables = value;
       break;
 
     default: