diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d78db3bc317..f28cf448312 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-11  Martin Jambor  <mjambor@suse.cz>
+
+	PR ipa/69044
+	* ipa-cp.c (estimate_local_effects): Do not clone for removal of
+	useless parameters if we cannot change function signature.
+
 2016-01-11  Martin Jambor  <mjambor@suse.cz>
 
 	PR ipa/66616
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index e17cc57f20c..5900d4d9158 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -2518,7 +2518,8 @@ estimate_local_effects (struct cgraph_node *node)
   known_aggs_ptrs = agg_jmp_p_vec_for_t_vec (known_aggs);
   int devirt_bonus = devirtualization_time_bonus (node, known_csts,
 					   known_contexts, known_aggs_ptrs);
-  if (always_const || devirt_bonus || removable_params_cost)
+  if (always_const || devirt_bonus
+      || (removable_params_cost && node->local.can_change_signature))
     {
       struct caller_statistics stats;
       inline_hints hints;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a160ed09517..69f589f281c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-11  Martin Jambor  <mjambor@suse.cz>
+
+	PR ipa/69044
+	* gcc.target/i386/chkp-pr69044.c: New test.
+
 2016-01-11  Tom de Vries  <tom@codesourcery.com>
 
 	PR tree-optimization/69109
diff --git a/gcc/testsuite/gcc.target/i386/chkp-pr69044.c b/gcc/testsuite/gcc.target/i386/chkp-pr69044.c
new file mode 100644
index 00000000000..933e88a6e3c
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/chkp-pr69044.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-require-effective-target mpx } */
+/* { dg-options "-fcheck-pointer-bounds -mmpx -O2" } */
+
+int i;
+int strncasecmp (char *p1, char *p2, long p3) { return 0; }
+int special_command ()
+{
+  if (strncasecmp (0, 0, 0))
+    i++;
+}